From 2b2fdb6427da41da9a569c07e3ae6118e63f9798 Mon Sep 17 00:00:00 2001
From: Maximilian Mader <max@bastelstu.be>
Date: Thu, 3 Oct 2019 16:04:22 +0200
Subject: [PATCH] [GTK3] Make VRAM viewer button bar slimmer

---
 gtk3/main.c                 |  5 +++++
 gtk3/resources/css/main.css | 10 +++++++++
 gtk3/resources/ui/window.ui | 44 +++++++++++++++++++++----------------
 gtk3/sameboy.gresource.xml  |  2 ++
 4 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 gtk3/resources/css/main.css

diff --git a/gtk3/main.c b/gtk3/main.c
index 2ad2f6d..17105df 100644
--- a/gtk3/main.c
+++ b/gtk3/main.c
@@ -479,6 +479,11 @@ static void activate(GApplication *app, gpointer user_data_gptr) {
 		create_fallback_canvas();
 	}
 
+	GdkScreen *screen = gdk_screen_get_default();
+	GtkCssProvider *provider = gtk_css_provider_new();
+	gtk_css_provider_load_from_resource(provider, RESOURCE_PREFIX "css/main.css");
+	gtk_style_context_add_provider_for_screen (screen, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
 	gtk_application_add_window(GTK_APPLICATION(app), GTK_WINDOW(main_window));
 	gtk_widget_show_all(GTK_WIDGET(main_window));
 
diff --git a/gtk3/resources/css/main.css b/gtk3/resources/css/main.css
new file mode 100644
index 0000000..dc59e7d
--- /dev/null
+++ b/gtk3/resources/css/main.css
@@ -0,0 +1,10 @@
+.vram-viewer-button-bar {
+	margin-bottom: 4px;
+}
+
+.vram-viewer-button-bar button {
+	padding: 2px 4px;
+	min-height: 11px;
+	min-width: 12px;
+	font-size: 0.8rem;
+}
\ No newline at end of file
diff --git a/gtk3/resources/ui/window.ui b/gtk3/resources/ui/window.ui
index 6363011..f207480 100644
--- a/gtk3/resources/ui/window.ui
+++ b/gtk3/resources/ui/window.ui
@@ -595,23 +595,6 @@ Maximilian Mader https://github.com/max-m</property>
                 <property name="position">3</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkCheckButton" id="aspect_ratio_toggle">
-                <property name="label" translatable="yes">Keep Aspect Ratio</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">10</property>
-                <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="on_keep_aspect_ratio_changed" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkCheckButton" id="integer_scaling_toggle">
                 <property name="label" translatable="yes">Use Integer Scaling</property>
@@ -629,6 +612,23 @@ Maximilian Mader https://github.com/max-m</property>
                 <property name="position">4</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkCheckButton" id="aspect_ratio_toggle">
+                <property name="label" translatable="yes">Keep Aspect Ratio</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">10</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_keep_aspect_ratio_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkLabel" id="menubar_override_selector_label">
                 <property name="can_focus">False</property>
@@ -1246,6 +1246,9 @@ Maximilian Mader https://github.com/max-m</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <style>
+                      <class name="vram-viewer-button-bar"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1315,7 +1318,7 @@ Maximilian Mader https://github.com/max-m</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -1388,10 +1391,13 @@ Maximilian Mader https://github.com/max-m</property>
                         <property name="position">4</property>
                       </packing>
                     </child>
+                    <style>
+                      <class name="vram-viewer-button-bar"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
diff --git a/gtk3/sameboy.gresource.xml b/gtk3/sameboy.gresource.xml
index 3afb84f..787895c 100644
--- a/gtk3/sameboy.gresource.xml
+++ b/gtk3/sameboy.gresource.xml
@@ -5,6 +5,8 @@
 		<file preprocess="xml-stripblanks">gtk/menus.ui</file>
 		<file preprocess="xml-stripblanks">gtk/menus-common.ui</file>
 		<file preprocess="xml-stripblanks">gtk/menus-traditional.ui</file>
+		
+		<file compressed="true">css/main.css</file>
 
 		<file alias="logo_256.png">pixmaps/logo/logo_256.png</file>
 		<file alias="logo_128.png">pixmaps/logo/logo_128.png</file>