[Xfce4-commits] [xfce/libxfce4ui] 23/28: XfceTitledDialog: Keep buttons in the action area

noreply at xfce.org noreply at xfce.org
Thu Jan 9 23:32:06 CET 2020


This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit 807f74118b50d1c16d01ac07f8d78b6dd71174fe
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sat Jan 4 23:18:31 2020 +0100

    XfceTitledDialog: Keep buttons in the action area
    
    Previously XfceTitledDialog would end up having its buttons moved to the
    headerbar by the constructed function of GtkDialog. By blocking this
    function we ensure that we have
    1) a headerbar and
    2) an action area.
    
    This is only desirable for XfceTitledDialog, which is a special kind of
    dialog (settings dialog).
    
    This commit fixes the behavior above when using the class directly.
---
 libxfce4ui/xfce-titled-dialog.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/libxfce4ui/xfce-titled-dialog.c b/libxfce4ui/xfce-titled-dialog.c
index adf81a2..f88a7e5 100644
--- a/libxfce4ui/xfce-titled-dialog.c
+++ b/libxfce4ui/xfce-titled-dialog.c
@@ -59,6 +59,7 @@ enum
 static GObject *xfce_titled_dialog_constructor    (GType                   type,
                                                    guint                   n_construct_params,
                                                    GObjectConstructParam  *construct_params);
+static void     xfce_titled_dialog_constructed    (GObject                *object);
 static void     xfce_titled_dialog_finalize       (GObject                *object);
 static void     xfce_titled_dialog_get_property   (GObject                *object,
                                                    guint                   prop_id,
@@ -105,6 +106,7 @@ xfce_titled_dialog_class_init (XfceTitledDialogClass *klass)
 
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->constructor = xfce_titled_dialog_constructor;
+  gobject_class->constructed = xfce_titled_dialog_constructed;
   gobject_class->get_property = xfce_titled_dialog_get_property;
   gobject_class->set_property = xfce_titled_dialog_set_property;
   gobject_class->finalize = xfce_titled_dialog_finalize;
@@ -151,6 +153,17 @@ xfce_titled_dialog_constructor (GType                  type,
 
 
 
+/*
+ * Block GtkDialog's constructed function which only repacks all items
+ * from the dialog's action area to its headerbar if use-header-bar is TRUE.
+ */
+static void
+xfce_titled_dialog_constructed (GObject *object)
+{
+}
+
+
+
 static void
 xfce_titled_dialog_init (XfceTitledDialog *titled_dialog)
 {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list