Merge pull request #4131 from grandixximo/touchy-fit-monitor

touchy: fit the window to the monitor

Author: hansu

docs/src/gui/touchy.adoc

@@ -96,6 +96,27 @@ cut off, reduce the DPI setting.
 
 All other font sizes can be changed on the Preferences tab.
 
+=== Fitting the screen
+
+Touchy bounds its window to the monitor and scrolls any tab whose content
+is larger than the screen, so the window never grows past the display
+edge (for example after loading a large tool table). The handwheel column
+is hidden on the Preferences tab so the settings have the full width.
+
+If the interface is still too large for a small screen, Touchy offers,
+once, to shrink the display fonts to fit:
+
+* *Shrink to fit and save* scales the fonts to the largest size that fits
+  and saves them as your preference (the font selectors update to match).
+* *Not now* leaves the fonts unchanged and does not ask again for this
+  screen size; it is offered again only if you move to a smaller screen.
+* *Never ask again* disables the offer on every screen.
+
+To turn the offer back on, tick *Offer to shrink fonts to fit the screen*
+in Preferences / Display Options, or set `fit_fonts = ask` in
+`~/.touchy_preferences` (the *Never ask again* choice stores
+`fit_fonts = never`).
+
 === Macros
 
 Touchy can invoke O-word macros using the MDI interface.  To configure

src/emc/usr_intf/touchy/listing.py

@@ -103,7 +103,7 @@ def next(self,b,count=1):
                     break
         self.show_line(self.start_line)
 
-    def on_select(self, b):
+    def on_select(self, b, *args):
         pass
 
     def clear_startline(self):

src/emc/usr_intf/touchy/touchy.glade

@@ -3173,7 +3173,7 @@ F1 S1</property>
                                   <object class="GtkTable" id="table3">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="n-rows">5</property>
+                                    <property name="n-rows">6</property>
                                     <property name="n-columns">3</property>
                                     <child>
                                       <placeholder/>
@@ -3402,6 +3402,27 @@ F1 S1</property>
                                         <property name="x-padding">10</property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="fitfontscheck">
+                                        <property name="label" translatable="yes">Offer to shrink fonts to fit the screen</property>
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="receives-default">False</property>
+                                        <property name="focus-on-click">False</property>
+                                        <property name="draw-indicator">True</property>
+                                        <signal name="toggled" handler="on_fitfontscheck_toggled" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left-attach">0</property>
+                                        <property name="right-attach">3</property>
+                                        <property name="top-attach">5</property>
+                                        <property name="bottom-attach">6</property>
+                                        <property name="x-options">GTK_FILL</property>
+                                        <property name="y-options"/>
+                                        <property name="x-padding">10</property>
+                                        <property name="y-padding">6</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                 </child>
                               </object>