From 3113334efb10f0970782c05937c674479dee3f9a Mon Sep 17 00:00:00 2001 From: hordepfo Date: Wed, 22 Jan 2014 18:23:23 +0000 Subject: [PATCH] Fixed some panel orientation issues --- usr/lib/linuxmint/mintMenu/mintMenu.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index 0fd119e..4d87878 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -584,20 +584,19 @@ class MenuWin( object ): self.button_box = Gtk.HBox() self.button_box.pack_start( self.button_icon, False, False, 0 ) self.button_box.pack_start( self.systemlabel, False, False, 0 ) - self.button_icon.set_padding( 5, 0 ) # if we have a vertical panel elif self.applet.get_orient() == MatePanelApplet.AppletOrient.LEFT: self.button_box = Gtk.VBox() self.systemlabel.set_angle( 270 ) - self.button_box.pack_start( self.systemlabel , True, True, 0) - self.button_box.pack_start( self.button_icon , True, True, 0) - self.button_icon.set_padding( 5, 0 ) + self.button_box.pack_start( self.button_icon , False, False, 0) + self.button_box.pack_start( self.systemlabel , False, False, 0) + self.button_icon.set_padding( 0, 5 ) elif self.applet.get_orient() == MatePanelApplet.AppletOrient.RIGHT: self.button_box = Gtk.VBox() self.systemlabel.set_angle( 90 ) - self.button_box.pack_start( self.button_icon , True, True, 0) - self.button_box.pack_start( self.systemlabel , True, True, 0) + self.button_box.pack_start( self.systemlabel , False, False, 0) + self.button_box.pack_start( self.button_icon , False, False, 0) self.button_icon.set_padding( 0, 5 ) self.button_box.set_homogeneous( False ) @@ -643,12 +642,12 @@ class MenuWin( object ): elif self.applet.get_orient() == MatePanelApplet.AppletOrient.LEFT: tmpbox = Gtk.VBox() self.systemlabel.set_angle( 270 ) - self.button_box.reorder_child( self.button_icon, 1 ) + self.button_box.reorder_child( self.button_icon, 0 ) self.button_icon.set_padding( 0, 5 ) elif self.applet.get_orient() == MatePanelApplet.AppletOrient.RIGHT: tmpbox = Gtk.VBox() self.systemlabel.set_angle( 90 ) - self.button_box.reorder_child( self.button_icon, 0 ) + self.button_box.reorder_child( self.button_icon, 1 ) self.button_icon.set_padding( 0, 5 ) tmpbox.set_homogeneous( False ) @@ -706,8 +705,7 @@ class MenuWin( object ): self.systemlabel.size_request(sl_req) if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: if self.hideIcon: - self.systemlabel.size_request(sl_req) - self.applet.set_size_request( sl_req.width + 2, -1 ) + self.applet.set_size_request( sl_req.width + 2, bi_req.height ) else: self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height ) else: