From 6844ad31e8e1ab1e7a0f8b0baa2f855db4e9b86d Mon Sep 17 00:00:00 2001
From: Maximilian Mader <max@bastelstu.be>
Date: Thu, 3 Oct 2019 15:26:49 +0200
Subject: [PATCH] [GTK3] Automatic resizing of the VRAM viewer

---
 gtk3/main.c                 |  2 +-
 gtk3/resources/ui/window.ui | 35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/gtk3/main.c b/gtk3/main.c
index b35a722..2ad2f6d 100644
--- a/gtk3/main.c
+++ b/gtk3/main.c
@@ -792,7 +792,7 @@ static gboolean on_draw_vram_viewer_tilemap(GtkWidget *widget, cairo_t *cr, gpoi
 	}
 
 	if (gtk_toggle_button_get_active(builder_get(GTK_TOGGLE_BUTTON, "vram_viewer_tilemap_toggle_scrolling_button"))) {
-		cairo_rectangle(cr, 0, 0, width, height);
+		cairo_rectangle(cr, -2, -2, width + 2, height + 2);
 
 		for (unsigned x = 0; x < 2; x++) {
 			for (unsigned y = 0; y < 2; y++) {
diff --git a/gtk3/resources/ui/window.ui b/gtk3/resources/ui/window.ui
index c61da64..6363011 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="integer_scaling_toggle">
-                <property name="label" translatable="yes">Use Integer Scaling</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_use_integer_scaling_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="aspect_ratio_toggle">
                 <property name="label" translatable="yes">Keep Aspect Ratio</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="integer_scaling_toggle">
+                <property name="label" translatable="yes">Use Integer Scaling</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_use_integer_scaling_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>
@@ -1152,6 +1152,7 @@ Maximilian Mader https://github.com/max-m</property>
   <object class="GtkWindow" id="vram_viewer">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">VRAM Viewer</property>
+    <property name="resizable">False</property>
     <child>
       <placeholder/>
     </child>