[gnome-panel] panel-widget: remove size_constrained



commit 95e077b12a781a82dcdc7969e47ce35b9bd16c86
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Apr 18 21:52:15 2020 +0300

    panel-widget: remove size_constrained
    
    It is always TRUE.

 gnome-panel/panel-applet-frame.c |  3 ---
 gnome-panel/panel-widget.c       | 30 ------------------------------
 gnome-panel/panel-widget.h       |  7 +------
 3 files changed, 1 insertion(+), 39 deletions(-)
---
diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
index b288c8cd4..a9431de72 100644
--- a/gnome-panel/panel-applet-frame.c
+++ b/gnome-panel/panel-applet-frame.c
@@ -792,9 +792,6 @@ _panel_applet_frame_activated (PanelAppletFrame           *frame,
                                      frame_act->settings);
        frame->priv->applet_info = info;
 
-       panel_widget_set_applet_size_constrained (frame->priv->panel,
-                                                 GTK_WIDGET (frame), TRUE);
-
        panel_lockdown_on_notify (panel_lockdown_get (),
                                  NULL,
                                  G_OBJECT (frame),
diff --git a/gnome-panel/panel-widget.c b/gnome-panel/panel-widget.c
index d507d097a..fc78e9349 100644
--- a/gnome-panel/panel-widget.c
+++ b/gnome-panel/panel-widget.c
@@ -1286,18 +1286,10 @@ panel_widget_size_request(GtkWidget *widget, GtkRequisition *requisition)
                 gtk_widget_get_preferred_size (ad->applet, &child_req, NULL);
 
                if (panel->orient == GTK_ORIENTATION_HORIZONTAL) {
-                       if (requisition->height < child_req.height &&
-                           !ad->size_constrained)
-                               requisition->height = child_req.height;
-
                        if (panel->packed &&
                            !(ad->expand_major && ad->size_hints))
                                requisition->width += child_req.width;
                } else {
-                       if (requisition->width < child_req.width &&
-                           !ad->size_constrained)
-                               requisition->width = child_req.width;
-
                        if (panel->packed &&
                            !(ad->expand_major && ad->size_hints))
                                requisition->height += child_req.height;
@@ -2332,7 +2324,6 @@ panel_widget_add (PanelWidget         *panel,
                ad->pack_type = pack_type;
                ad->pack_index = pack_index;
                ad->constrained = 0;
-               ad->size_constrained = FALSE;
                ad->expand_major = FALSE;
                ad->expand_minor = FALSE;
                ad->size_hints = NULL;
@@ -2620,27 +2611,6 @@ panel_widget_get_applet_orientation (PanelWidget *panel)
        return panel_toplevel_get_orientation (panel->toplevel);
 }
 
-void
-panel_widget_set_applet_size_constrained (PanelWidget *panel,
-                                         GtkWidget   *applet,
-                                         gboolean     size_constrained)
-{
-       AppletData *ad;
-
-       ad = g_object_get_data (G_OBJECT (applet), PANEL_APPLET_DATA);
-       if (!ad)
-               return;
-
-       size_constrained = size_constrained != FALSE;
-
-       if (ad->size_constrained == size_constrained)
-               return;
-
-       ad->size_constrained = size_constrained;
-
-       gtk_widget_queue_resize (GTK_WIDGET (panel));
-}
-
 void
 panel_widget_set_applet_expandable (PanelWidget *panel,
                                    GtkWidget   *applet,
diff --git a/gnome-panel/panel-widget.h b/gnome-panel/panel-widget.h
index ef30c1f91..0389186db 100644
--- a/gnome-panel/panel-widget.h
+++ b/gnome-panel/panel-widget.h
@@ -64,8 +64,7 @@ struct _AppletData
        /* Valid size ranges for expanded applets */
        int *           size_hints; 
        int             size_hints_len;
-  
-       guint           size_constrained : 1;
+
        guint           expand_major : 1;
        guint           expand_minor : 1;
 };
@@ -181,10 +180,6 @@ void            panel_widget_focus              (PanelWidget *panel);
 
 PanelOrientation panel_widget_get_applet_orientation (PanelWidget *panel);
 
-
-void     panel_widget_set_applet_size_constrained (PanelWidget *panel,
-                                                  GtkWidget   *applet,
-                                                  gboolean     size_constrained);
 void     panel_widget_set_applet_expandable       (PanelWidget *panel,
                                                   GtkWidget   *applet,
                                                   gboolean     major,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]