cg button scaling, code cleanup

game/screens.rpy

@@ -609,46 +609,6 @@ style main_menu_text:
 style main_menu_title:
     properties gui.text_properties("title")
 
-## Gallery screen ################################################################
-##
-## This screen holds the Gallery.
-##
-
-screen gallery():
-
-    tag menu
-    ## This use statement includes the game_menu screen inside this one. The
-    ## vbox child is then included inside the viewport inside the game_menu
-    ## screen.
-    style_prefix "main_menu"
-
-    add gui.main_menu_background
-    add gui.extras_submenu_panel
-
-    frame:
-        pass
-
-    vbox:
-        xpos 500
-        yalign 0.2
-        textbutton "Back to Extras" action ShowMenu("extras")
-
-    vbox:
-        viewport id "gallery":
-            xpos 700
-            ypos 1000
-            style_prefix "gallery"
-            use images
-        text _("") ## Not sure why, but this keeps the vbox below working ... Renpy quirk? Does it kill scrolling in the viewport? Tune in when we have the gallery populated in the images screen.
-
-
-
-    vbox:
-        xpos 1942
-        # xalign 1.0
-        yalign 0.95
-        use extrasnavigation
-
 style main_menu_frame is empty
 style main_menu_vbox is vbox
 style main_menu_text is gui_text
@@ -675,21 +635,6 @@ style main_menu_title:
     properties gui.text_properties("title")
 
 
-## Images Screen ################################################################
-##
-## This is the screen that actually houses the images of the gallery
-screen images():
-    tag menu
-    style_prefix "main_menu"
-
-    frame:
-        pass
-    vbox:
-        xpos 600
-        ypos 600
-        text _("Placeholder for gallery.")
-
-
 
 ## Updates screen ################################################################
 ##
@@ -1247,7 +1192,7 @@ screen extrasnavigation():
         imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("help")
         imagebutton auto "gui/button/menubuttons/aboutbutton_%s.png" action ShowMenu("about")
         imagebutton auto "gui/button/menubuttons/updatesbutton_%s.png" action ShowMenu("updates")
-        imagebutton auto "gui/button/menubuttons/gallerybutton_%s.png" action ShowMenu("gallery")
+        imagebutton auto "gui/button/menubuttons/gallerybutton_%s.png" action ShowMenu("cg_gallery")
         imagebutton auto "gui/button/menubuttons/returnbutton_%s.png" action ShowMenu("main_menu")