move text to be inline with menu

shadeyg56 · Feb 21, 2023 · e2eaffc · e2eaffc
1 parent e1dae9d
commit e2eaffc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/auto_cpufreq/gui/app.py b/auto_cpufreq/gui/app.py
@@ -23,25 +23,26 @@ def __init__(self):
         self.set_resizable(False)
         self.load_css()
         pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(filename="/usr/local/share/auto-cpufreq/images/icon.png", width=500, height=500, preserve_aspect_ratio=True)
-        #self.set_icon(pixbuf)
+        self.set_icon(pixbuf)
         self.build()
 
     def main(self):
-        # main VBOX
-        self.vbox_top = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.vbox_top.set_valign(Gtk.Align.CENTER)
-        self.vbox_top.set_halign(Gtk.Align.CENTER)
-        self.add(self.vbox_top)
+        # self.vbox_top = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
+        # self.vbox_top.set_valign(Gtk.Align.CENTER)
+        # self.vbox_top.set_halign(Gtk.Align.CENTER)
+        #self.add(self.vbox_top)
 
+        # Main HBOX
         self.hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=HBOX_PADDING)
 
         self.systemstats = SystemStatsLabel()
         self.hbox.pack_start(self.systemstats, False, False, 0)
+        self.add(self.hbox)
 
         self.vbox_right = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=20)
 
         self.menu = DropDownMenu(self)
-        self.vbox_top.pack_start(self.menu, False, False, 0)
+        self.hbox.pack_end(self.menu, False, False, 0)
 
         self.currentgovernor = CurrentGovernorBox()
         self.vbox_right.pack_start(self.currentgovernor, False, False, 0)
@@ -50,7 +51,7 @@ def main(self):
         self.cpufreqstats = CPUFreqStatsLabel()
         self.vbox_right.pack_start(self.cpufreqstats, False, False, 0)
 
-        self.hbox.pack_start(self.vbox_right, True, True, 0)
+        self.hbox.pack_start(self.vbox_right, False, False, 0)
 
         self.vbox_top.pack_start(self.hbox, False, False, 0)
 

diff --git a/auto_cpufreq/gui/objects.py b/auto_cpufreq/gui/objects.py
@@ -139,6 +139,7 @@ class DropDownMenu(Gtk.MenuButton):
     def __init__(self, parent):
         super().__init__()
         self.set_halign(Gtk.Align.END)
+        self.set_valign(Gtk.Align.START)
         self.image = Gtk.Image.new_from_icon_name("open-menu-symbolic", Gtk.IconSize.LARGE_TOOLBAR)
         self.add(self.image)
         self.menu = self.build_menu(parent)