aboutsummaryrefslogtreecommitdiff
path: root/src/ChatWindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ChatWindow.cpp')
-rw-r--r--src/ChatWindow.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ChatWindow.cpp b/src/ChatWindow.cpp
index 76df69e..437282a 100644
--- a/src/ChatWindow.cpp
+++ b/src/ChatWindow.cpp
@@ -249,7 +249,7 @@ namespace dchat
{
Gtk::Grid *chatArea = Gtk::manage(new Gtk::Grid());
chatArea->set_name("chat-area");
- rightPanel->attach(*chatArea, 0, 2, 1, 1);
+ rightPanel->attach(*chatArea, 0, 3, 1, 1);
Gtk::ScrolledWindow *chatScrollWindow = Gtk::manage(new Gtk::ScrolledWindow());
chatScrollWindow->set_hexpand(true);
@@ -372,12 +372,13 @@ namespace dchat
Gtk::ScrolledWindow *messageArea = Gtk::manage(new Gtk::ScrolledWindow());
messageArea->set_vexpand(true);
messageArea->set_overlay_scrolling(false);
- messageArea->set_policy(Gtk::PolicyType::POLICY_NEVER, Gtk::PolicyType::POLICY_AUTOMATIC);
+ messageArea->set_policy(Gtk::PolicyType::POLICY_NEVER, Gtk::PolicyType::POLICY_ALWAYS);
messageAreaStack.add(*messageArea, roomIdStr, "Room name");
if(!messageAreaStack.get_visible_child())
messageAreaStack.set_visible_child(roomIdStr);
Gtk::Grid *messageAreaLayout = new Gtk::Grid();
+ messageAreaLayout->set_valign(Gtk::ALIGN_START);
messageArea->add(*messageAreaLayout);
messageArea->show_all();
@@ -477,8 +478,8 @@ namespace dchat
message->avatar.url = "https://discordemoji.com/assets/emoji/PeepoHide.png";
else
message->avatar.url = request.message->creator->avatarUrl;
- message->set_valign(Gtk::Align::ALIGN_START);
- message->set_hexpand(true);
+ //message->set_valign(Gtk::Align::ALIGN_START);
+ //message->set_hexpand(true);
message->show_all();
messageById[request.message->id] = message;
RoomData *roomData = roomDataById[*request.room->id];