From 630a140d2f6611dfc5f8be89a55766d7ded19da1 Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Sat, 29 Apr 2023 15:20:36 -0500 Subject: [PATCH] Changed content layout --- src/core/containers/base_container.py | 21 ++++++-------------- src/core/containers/right_box.py | 4 ++++ user_config/usr/share/mirage2/stylesheet.css | 4 ++++ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/core/containers/base_container.py b/src/core/containers/base_container.py index a280963..abf1fdd 100644 --- a/src/core/containers/base_container.py +++ b/src/core/containers/base_container.py @@ -8,8 +8,7 @@ from gi.repository import Gtk # Application imports from .left_box import LeftBox from .right_box import RightBox -from ..widgets.button_controls import ButtonControls -from ..widgets.path_label import PathLabel + class BaseContainer(Gtk.Box): @@ -24,21 +23,13 @@ class BaseContainer(Gtk.Box): def _setup_styling(self): - self.set_orientation(Gtk.Orientation.VERTICAL) + self.set_orientation(Gtk.Orientation.HORIZONTAL) + ctx = self.get_style_context() + ctx.add_class("container-padding-5px") def _setup_signals(self): ... def _load_widgets(self): - box = Gtk.Box() - box2 = Gtk.Box() - box.set_orientation(Gtk.Orientation.VERTICAL) - box2.set_orientation(Gtk.Orientation.HORIZONTAL) - - box.add(ButtonControls()) - box.add(PathLabel()) - box2.add(LeftBox()) - box2.add(RightBox()) - - self.add(box) - self.add(box2) + self.add(LeftBox()) + self.add(RightBox()) diff --git a/src/core/containers/right_box.py b/src/core/containers/right_box.py index 681c4d1..48ee157 100644 --- a/src/core/containers/right_box.py +++ b/src/core/containers/right_box.py @@ -8,6 +8,8 @@ from gi.repository import Gtk from gi.repository import Gdk # Application imports +from ..widgets.button_controls import ButtonControls +from ..widgets.path_label import PathLabel from .image_view_scroll import ImageViewScroll @@ -32,4 +34,6 @@ class RightBox(Gtk.Box): ... def _load_widgets(self): + self.add(ButtonControls()) + self.add(PathLabel()) self.add(ImageViewScroll()) diff --git a/user_config/usr/share/mirage2/stylesheet.css b/user_config/usr/share/mirage2/stylesheet.css index 0b4b7b6..d6b2165 100644 --- a/user_config/usr/share/mirage2/stylesheet.css +++ b/user_config/usr/share/mirage2/stylesheet.css @@ -4,6 +4,10 @@ border: 2px solid rgba(56, 56, 56, 1); } +.container-padding-5px { + margin: 5px; +} + .button-highlighted { background-color: #AB7E45; }