fixed alignment issue

naxuroqa · May 23, 2014 · d58af58 · d58af58
1 parent 6f89a57
commit d58af58
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/ui/ChatMessage.vala b/src/ui/ChatMessage.vala
@@ -23,7 +23,7 @@ namespace Venom {
     private Gtk.Label message_label;
     private Gtk.Label date_label;
 
-    public ChatMessage(IMessage message, bool short_names, bool following){
+    public ChatMessage(IMessage message, bool short_names, bool following, int offset){
       init_widgets();
 
       if( message.is_action ) {
@@ -39,12 +39,19 @@ namespace Venom {
         }
       } else {
         name_label.set_text("");
+        name_label.set_size_request(offset, -1);
       }
       string markup_message_text = Tools.markup_uris(message.get_message_plain());
       message_label.set_markup( markup_message_text );
       date_label.set_text( message.get_time_plain() );
     }
 
+    public int get_name_label_width() {
+      Gtk.Requisition req;
+      name_label.get_preferred_size(null, out req);
+      return req.width;
+    }
+
     private void init_widgets() {
       this.get_style_context().add_class("message_entry");
       this.spacing = 12;

diff --git a/src/ui/ConversationView.vala b/src/ui/ConversationView.vala
@@ -35,6 +35,7 @@ namespace Venom {
     private Gtk.Box conversation_list;
     private Gtk.Label is_typing_label;
     private IMessage last_message = null;
+    private int last_width;
 
     public void on_typing_changed(bool status) {
       is_typing_label.visible = status;
@@ -59,17 +60,26 @@ namespace Venom {
     public void add_filetransfer(FileTransferChatEntry entry) {
       conversation_list.pack_start(entry, false, false, 0);
       entry.set_visible(true);
+
+      last_message = null;
     }
 
     public void add_message(IMessage message) {
+      bool same_sender = false;
       ChatMessage cm;
+
       if(last_message != null && last_message.compare_sender(message)) {
-        cm = new ChatMessage(message, short_names, true);
-      } else {
-        cm = new ChatMessage(message, short_names, false);
+        same_sender = true;
       }
+
+      cm = new ChatMessage(message, short_names, same_sender, last_width);
+
       conversation_list.pack_start(cm, false, false);
       cm.show_all();
+
+      if(!same_sender) {
+        last_width = cm.get_name_label_width();
+      }
       last_message = message;
     }
     public void register_search_entry(Gtk.Entry entry) {