Port from GTK3 to GTK4

1 files changed, 90 insertions, 127 deletions

diff --git a/main/src/ui/conversation_content_view/message_widget.vala b/main/src/ui/conversation_content_view/message_widget.vala
index e7bd1282..3ebce0ee 100644
--- a/main/src/ui/conversation_content_view/message_widget.vala
+++ b/main/src/ui/conversation_content_view/message_widget.vala
@@ -10,84 +10,16 @@ namespace Dino.Ui.ConversationSummary {
 
 public class MessageMetaItem : ContentMetaItem {
 
-    private StreamInteractor stream_interactor;
-    private MessageItemWidget message_item_widget;
-    private MessageItem message_item;
-
-    public MessageMetaItem(ContentItem content_item, StreamInteractor stream_interactor) {
-        base(content_item);
-        message_item = content_item as MessageItem;
-        this.stream_interactor = stream_interactor;
-    }
-
-    public override Object? get_widget(Plugins.WidgetType type) {
-        message_item_widget = new MessageItemWidget(stream_interactor, content_item) { visible=true };
-
-        message_item_widget.edit_cancelled.connect(() => { this.in_edit_mode = false; });
-        message_item_widget.edit_sent.connect(on_edit_send);
-
-        stream_interactor.get_module(MessageCorrection.IDENTITY).received_correction.connect(on_received_correction);
-
-        this.notify["in-edit-mode"].connect(() => {
-            if (in_edit_mode == false) return;
-            bool allowed = stream_interactor.get_module(MessageCorrection.IDENTITY).is_own_correction_allowed(message_item.conversation, message_item.message);
-            if (allowed) {
-                message_item_widget.set_edit_mode();
-            } else {
-                this.in_edit_mode = false;
-            }
-        });
-
-        return message_item_widget;
-    }
-
-    public override Gee.List<Plugins.MessageAction>? get_item_actions(Plugins.WidgetType type) {
-        if (content_item as FileItem != null) return null;
-
-        bool allowed = stream_interactor.get_module(MessageCorrection.IDENTITY).is_own_correction_allowed(message_item.conversation, message_item.message);
-        Gee.List<Plugins.MessageAction> actions = new ArrayList<Plugins.MessageAction>();
-        if (allowed && !in_edit_mode) {
-            Plugins.MessageAction action1 = new Plugins.MessageAction();
-            action1.icon_name = "document-edit-symbolic";
-            action1.callback = (button, content_meta_item_activated, widget) => {
-                this.in_edit_mode = true;
-            };
-            actions.add(action1);
-        }
-        return actions;
-    }
-
-    private void on_edit_send(string text) {
-        stream_interactor.get_module(MessageCorrection.IDENTITY).send_correction(message_item.conversation, message_item.message, text);
-        this.in_edit_mode = false;
-    }
-
-    private void on_received_correction(ContentItem content_item) {
-        if (this.content_item.id == content_item.id) {
-            this.content_item = content_item;
-            message_item = content_item as MessageItem;
-            message_item_widget.content_item = content_item;
-            message_item_widget.update_label();
-        }
-    }
-}
-
-public class MessageItemWidget : SizeRequestBin {
-
-    public signal void edit_cancelled();
-    public signal void edit_sent(string text);
-
     enum AdditionalInfo {
         NONE,
         PENDING,
         DELIVERY_FAILED
     }
 
-    StreamInteractor stream_interactor;
-    public ContentItem content_item;
+    private StreamInteractor stream_interactor;
+    private MessageItem message_item;
     public Message.Marked marked { get; set; }
 
-    Label label = new Label("") { use_markup=true, xalign=0, selectable=true, wrap=true, wrap_mode=Pango.WrapMode.WORD_CHAR, vexpand=true, visible=true };
     MessageItemEditMode? edit_mode = null;
     ChatTextViewController? controller = null;
     AdditionalInfo additional_info = AdditionalInfo.NONE;
@@ -96,15 +28,14 @@ public class MessageItemWidget : SizeRequestBin {
     ulong style_updated_id = -1;
     ulong marked_notify_handler_id = -1;
 
-    construct {
-        this.add(label);
-        label.activate_link.connect(on_label_activate_link);
-        this.size_request_mode = SizeRequestMode.HEIGHT_FOR_WIDTH;
-    }
+    public Label label = new Label("") { use_markup=true, xalign=0, selectable=true, wrap=true, wrap_mode=Pango.WrapMode.WORD_CHAR, hexpand=true, vexpand=true, can_focus=false };
 
-    public MessageItemWidget(StreamInteractor stream_interactor, ContentItem content_item) {
+    public MessageMetaItem(ContentItem content_item, StreamInteractor stream_interactor) {
+        base(content_item);
+        message_item = content_item as MessageItem;
         this.stream_interactor = stream_interactor;
-        this.content_item = content_item;
+
+        label.activate_link.connect(on_label_activate_link);
 
         Message message = ((MessageItem) content_item).message;
         if (message.direction == Message.DIRECTION_SENT && !(message.marked in Message.MARKED_RECEIVED)) {
@@ -137,51 +68,6 @@ public class MessageItemWidget : SizeRequestBin {
         update_label();
     }
 
-    public void set_edit_mode() {
-
-        MessageItem message_item = content_item as MessageItem;
-        Message message = message_item.message;
-
-        if (edit_mode == null) {
-            edit_mode = new MessageItemEditMode();
-            controller = new ChatTextViewController(edit_mode.chat_text_view, stream_interactor);
-            Conversation conversation = message_item.conversation;
-            controller.initialize_for_conversation(conversation);
-
-            edit_mode.cancelled.connect(() => {
-                edit_cancelled();
-                unset_edit_mode();
-            });
-            edit_mode.send.connect(() => {
-                if (((MessageItem) content_item).message.body != edit_mode.chat_text_view.text_view.buffer.text) {
-                    edit_sent(edit_mode.chat_text_view.text_view.buffer.text);
-                } else {
-                    edit_cancelled();
-                }
-                unset_edit_mode();
-            });
-        }
-
-        edit_mode.chat_text_view.text_view.buffer.text = message.body;
-
-        this.remove(label);
-        this.add(edit_mode);
-
-        edit_mode.chat_text_view.text_view.grab_focus();
-    }
-
-    public void unset_edit_mode() {
-        this.remove(edit_mode);
-        this.add(label);
-        label.grab_focus();
-        label.selectable = false;
-        label.selectable = true;
-    }
-
-    public void update_label() {
-        label.label = generate_markup_text(content_item);
-    }
-
     private string generate_markup_text(ContentItem item) {
         MessageItem message_item = item as MessageItem;
         Conversation conversation = message_item.conversation;
@@ -198,9 +84,9 @@ public class MessageItemWidget : SizeRequestBin {
         }
 
         if (conversation.type_ == Conversation.Type.GROUPCHAT) {
-            markup_text = Util.parse_add_markup_theme(markup_text, conversation.nickname, true, true, true, Util.is_dark_theme(this), ref theme_dependent);
+            markup_text = Util.parse_add_markup_theme(markup_text, conversation.nickname, true, true, true, Util.is_dark_theme(this.label), ref theme_dependent);
         } else {
-            markup_text = Util.parse_add_markup_theme(markup_text, null, true, true, true, Util.is_dark_theme(this), ref theme_dependent);
+            markup_text = Util.parse_add_markup_theme(markup_text, null, true, true, true, Util.is_dark_theme(this.label), ref theme_dependent);
         }
 
         if (message.body.has_prefix("/me ")) {
@@ -214,7 +100,7 @@ public class MessageItemWidget : SizeRequestBin {
             markup_text = @"<span size=\'$size_str\'>" + markup_text + "</span>";
         }
 
-        string dim_color = Util.is_dark_theme(this) ? "#BDBDBD" : "#707070";
+        string dim_color = Util.is_dark_theme(this.label) ? "#BDBDBD" : "#707070";
 
         if (message.edit_to != null) {
             markup_text += @"  <span size='small' color='$dim_color'>(%s)</span>".printf(_("edited"));
@@ -246,7 +132,7 @@ public class MessageItemWidget : SizeRequestBin {
 
         if (theme_dependent && realize_id == -1) {
             realize_id = label.realize.connect(update_label);
-            style_updated_id = label.style_updated.connect(update_label);
+//            style_updated_id = label.style_updated.connect(update_label);
         } else if (!theme_dependent && realize_id != -1) {
             label.disconnect(realize_id);
             label.disconnect(style_updated_id);
@@ -254,6 +140,83 @@ public class MessageItemWidget : SizeRequestBin {
         return markup_text;
     }
 
+    public void update_label() {
+        label.label = generate_markup_text(content_item);
+    }
+
+    public override Object? get_widget(Plugins.ConversationItemWidgetInterface outer, Plugins.WidgetType type) {
+
+        stream_interactor.get_module(MessageCorrection.IDENTITY).received_correction.connect(on_received_correction);
+
+        this.notify["in-edit-mode"].connect(() => {
+            if (in_edit_mode == false) return;
+            bool allowed = stream_interactor.get_module(MessageCorrection.IDENTITY).is_own_correction_allowed(message_item.conversation, message_item.message);
+            if (allowed) {
+                MessageItem message_item = content_item as MessageItem;
+                Message message = message_item.message;
+
+                edit_mode = new MessageItemEditMode();
+                controller = new ChatTextViewController(edit_mode.chat_text_view, stream_interactor);
+                Conversation conversation = message_item.conversation;
+                controller.initialize_for_conversation(conversation);
+
+                edit_mode.cancelled.connect(() => {
+                    in_edit_mode = false;
+                    outer.set_widget(label, Plugins.WidgetType.GTK4);
+                    label.grab_focus();
+                });
+                edit_mode.send.connect(() => {
+                    if (((MessageItem) content_item).message.body != edit_mode.chat_text_view.text_view.buffer.text) {
+                        on_edit_send(edit_mode.chat_text_view.text_view.buffer.text);
+                    } else {
+//                        edit_cancelled();
+                    }
+                    in_edit_mode = false;
+                    outer.set_widget(label, Plugins.WidgetType.GTK4);
+                    label.grab_focus();
+                });
+
+                edit_mode.chat_text_view.text_view.buffer.text = message.body;
+
+                outer.set_widget(edit_mode, Plugins.WidgetType.GTK4);
+                edit_mode.chat_text_view.text_view.grab_focus();
+            } else {
+                this.in_edit_mode = false;
+            }
+        });
+
+        return label;
+    }
+
+    public override Gee.List<Plugins.MessageAction>? get_item_actions(Plugins.WidgetType type) {
+        if (content_item as FileItem != null) return null;
+
+        bool allowed = stream_interactor.get_module(MessageCorrection.IDENTITY).is_own_correction_allowed(message_item.conversation, message_item.message);
+        Gee.List<Plugins.MessageAction> actions = new ArrayList<Plugins.MessageAction>();
+        if (allowed && !in_edit_mode) {
+            Plugins.MessageAction action1 = new Plugins.MessageAction();
+            action1.icon_name = "document-edit-symbolic";
+            action1.callback = (button, content_meta_item_activated, widget) => {
+                this.in_edit_mode = true;
+            };
+            actions.add(action1);
+        }
+        return actions;
+    }
+
+    private void on_edit_send(string text) {
+        stream_interactor.get_module(MessageCorrection.IDENTITY).send_correction(message_item.conversation, message_item.message, text);
+        this.in_edit_mode = false;
+    }
+
+    private void on_received_correction(ContentItem content_item) {
+        if (this.content_item.id == content_item.id) {
+            this.content_item = content_item;
+            message_item = content_item as MessageItem;
+            update_label();
+        }
+    }
+
     public static bool on_label_activate_link(string uri) {
         // Always handle xmpp URIs with Dino
         if (!uri.has_prefix("xmpp:")) return false;
@@ -276,7 +239,7 @@ public class MessageItemEditMode : Box {
     [GtkChild] public unowned Frame frame;
 
     construct {
-        Util.force_css(frame, "* { border-radius: 3px; }");
+        Util.force_css(frame, "* { border-radius: 3px; padding: 5px 7px; }");
 
         EmojiChooser chooser = new EmojiChooser();
         chooser.emoji_picked.connect((emoji) => {