[gnome-panel] toplevel: revert "make sure panel widget has real size"



commit 9df1bfba9ddd02b95af2347060f65cf71d02fc2c
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Apr 26 00:09:58 2021 +0300

    toplevel: revert "make sure panel widget has real size"
    
    This reverts remaining part of 3d1efeee53c9. Style updated part
    was removed in previous commit.
    
    Panel now should get correct allocation even if it is bigger
    than configured size.
    
    Original fix was incorrect.

 gnome-panel/panel-toplevel.c | 6 ------
 1 file changed, 6 deletions(-)
---
diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
index d7b82e893..1b13859d6 100644
--- a/gnome-panel/panel-toplevel.c
+++ b/gnome-panel/panel-toplevel.c
@@ -1945,7 +1945,6 @@ panel_toplevel_update_size (PanelToplevel  *toplevel,
 {
        int monitor_width, monitor_height;
        int width, height;
-       int size;
        int minimum_height;
 
        if (toplevel->priv->animating)
@@ -1975,7 +1974,6 @@ panel_toplevel_update_size (PanelToplevel  *toplevel,
                                                        monitor_width);
 
                width  = MAX (MINIMUM_WIDTH, width);
-               size = height;
        } else {
                width = MAX (MIN (MAX (width, toplevel->priv->size),
                                  panel_toplevel_get_maximum_size (toplevel)),
@@ -1990,16 +1988,12 @@ panel_toplevel_update_size (PanelToplevel  *toplevel,
                                                        monitor_height);
 
                height = MAX (MINIMUM_WIDTH, height);
-               size = width;
        }
 
        toplevel->priv->geometry.width  = CLAMP (width,  0, monitor_width);
        toplevel->priv->geometry.height = CLAMP (height, 0, monitor_height);
        toplevel->priv->original_width  = toplevel->priv->geometry.width;
        toplevel->priv->original_height = toplevel->priv->geometry.height;
-
-       if (toplevel->priv->size < size)
-               panel_widget_set_size (toplevel->priv->panel_widget, size);
 }
 
 static void


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