jbah.skp/mintmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63 from hordepfo/orientation

Browse Source 
Fixed some panel orientation issues
This commit is contained in:
Clement Lefebvre 2014-03-18 11:00:43 +00:00
commit 55f19b3d28
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr/lib/linuxmint/mintMenu/mintMenu.py
View File

@ -590,20 +590,19 @@ class MenuWin( object ):
self.button_box = Gtk.HBox() self.button_box = Gtk.HBox()
self.button_box.pack_start( self.button_icon, False, False, 0 ) self.button_box.pack_start( self.button_icon, False, False, 0 )
self.button_box.pack_start( self.systemlabel, False, False, 0 ) self.button_box.pack_start( self.systemlabel, False, False, 0 )
self.button_icon.set_padding( 5, 0 ) self.button_icon.set_padding( 5, 0 )
# if we have a vertical panel # if we have a vertical panel
elif self.applet.get_orient() == MatePanelApplet.AppletOrient.LEFT: elif self.applet.get_orient() == MatePanelApplet.AppletOrient.LEFT:
self.button_box = Gtk.VBox() self.button_box = Gtk.VBox()
self.systemlabel.set_angle( 270 ) self.systemlabel.set_angle( 270 )
self.button_box.pack_start( self.systemlabel , True, True, 0) self.button_box.pack_start( self.button_icon , False, False, 0)
self.button_box.pack_start( self.button_icon , True, True, 0) self.button_box.pack_start( self.systemlabel , False, False, 0)
self.button_icon.set_padding( 5, 0 ) self.button_icon.set_padding( 0, 5 )
elif self.applet.get_orient() == MatePanelApplet.AppletOrient.RIGHT: elif self.applet.get_orient() == MatePanelApplet.AppletOrient.RIGHT:
self.button_box = Gtk.VBox() self.button_box = Gtk.VBox()
self.systemlabel.set_angle( 90 ) self.systemlabel.set_angle( 90 )
self.button_box.pack_start( self.button_icon , True, True, 0) self.button_box.pack_start( self.systemlabel , False, False, 0)
self.button_box.pack_start( self.systemlabel , True, True, 0) self.button_box.pack_start( self.button_icon , False, False, 0)
self.button_icon.set_padding( 0, 5 ) self.button_icon.set_padding( 0, 5 )
self.button_box.set_homogeneous( False ) self.button_box.set_homogeneous( False )
@ -649,12 +648,12 @@ class MenuWin( object ):
elif self.applet.get_orient() == MatePanelApplet.AppletOrient.LEFT: elif self.applet.get_orient() == MatePanelApplet.AppletOrient.LEFT:
tmpbox = Gtk.VBox() tmpbox = Gtk.VBox()
self.systemlabel.set_angle( 270 ) 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 ) self.button_icon.set_padding( 0, 5 )
elif self.applet.get_orient() == MatePanelApplet.AppletOrient.RIGHT: elif self.applet.get_orient() == MatePanelApplet.AppletOrient.RIGHT:
tmpbox = Gtk.VBox() tmpbox = Gtk.VBox()
self.systemlabel.set_angle( 90 ) 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 ) self.button_icon.set_padding( 0, 5 )
tmpbox.set_homogeneous( False ) tmpbox.set_homogeneous( False )
@ -712,8 +711,7 @@ class MenuWin( object ):
self.systemlabel.size_request(sl_req) self.systemlabel.size_request(sl_req)
if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN:
if self.hideIcon: if self.hideIcon:
self.systemlabel.size_request(sl_req) self.applet.set_size_request( sl_req.width + 2, bi_req.height )
self.applet.set_size_request( sl_req.width + 2, -1 )
else: else:
self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height ) self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height )
else: else: