texlive[54910] Master: Tcl GUIs: show again actual scaling in menu.

[commits+siepo at tug.org]

Revision: 54910
          http://tug.org/svn/texlive?view=revision&revision=54910
Author:   siepo
Date:     2020-04-27 20:46:48 +0200 (Mon, 27 Apr 2020)
Log Message:
-----------
Tcl GUIs: show again actual scaling in menu. Removed spurious 'attributes -topmost' statements

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/tlshell/tlshell.tcl
    trunk/Master/tlpkg/installer/install-tl-gui.tcl
    trunk/Master/tlpkg/tltcl/tltcl.tcl

Modified: trunk/Master/texmf-dist/scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Master/texmf-dist/scripts/tlshell/tlshell.tcl	2020-04-27 17:23:52 UTC (rev 54909)
+++ trunk/Master/texmf-dist/scripts/tlshell/tlshell.tcl	2020-04-27 18:46:48 UTC (rev 54910)
@@ -2184,6 +2184,8 @@
   .mn.opt add cascade -label [__ "GUI font scaling"] \
       -menu .mn.opt.fscale
   menu .mn.opt.fscale
+  .mn.opt.fscale add command -label \
+      "[__ "Current"]:  [format {%.2f} $::tkfontscale]"
   foreach s {0.6 0.8 1 1.2 1.6 2 2.5 3 3.8 5 6 7.5 9} {
     .mn.opt.fscale add command -label $s -command "set_fontscale $s"
   }
@@ -2407,6 +2409,7 @@
   wm protocol . WM_DELETE_WINDOW {cancel_or_destroy .q .}
   wm resizable . 1 1
   wm state . normal
+  raise .
 }
 
 # to be invoked at initialization and after a font scaling change
@@ -2509,7 +2512,6 @@
   get_packages_info_local
   collect_filtered
   get_repos_from_tlmgr
-  rebuild_interface
 }; # initialize
 
 initialize

Modified: trunk/Master/tlpkg/installer/install-tl-gui.tcl
===================================================================
--- trunk/Master/tlpkg/installer/install-tl-gui.tcl	2020-04-27 17:23:52 UTC (rev 54909)
+++ trunk/Master/tlpkg/installer/install-tl-gui.tcl	2020-04-27 18:46:48 UTC (rev 54910)
@@ -393,7 +393,6 @@
   ppack [ttk::button .splfb.slmir_a -text [__ "Abort"] -command maybe_abort] \
       -side right
 
-  wm attributes . -topmost
   update
   wm state . normal
   raise .
@@ -421,7 +420,6 @@
                                           $::prelocation]] -in .bg
   }
 
-  wm attributes . -topmost
   update
   wm state . normal
   raise .
@@ -466,7 +464,6 @@
 
   wm resizable . 1 1
   wm overrideredirect . 0
-  wm attributes . -topmost
   update
   wm state . normal
   raise .
@@ -1399,6 +1396,8 @@
 
   menu .mn.gui.fscale
   .mn.gui add cascade -label [__ "Font scaling"] -menu .mn.gui.fscale
+  .mn.gui.fscale add command -label \
+    "Current: [format {%.2f} $::tkfontscale]"
   foreach s {0.6 0.8 1 1.2 1.6 2 2.5 3 3.8 5 6 7.5 9} {
     .mn.gui.fscale add command -label $s -command "set_fontscale $s"
   }
@@ -1789,7 +1788,6 @@
   if $::advanced {port_dis_or_activate 0}
   show_stats
   wm overrideredirect . 0
-  wm attributes . -topmost
   wm resizable . 0 0
   update
   wm state . normal
@@ -2062,7 +2060,7 @@
   set ::perlpid [pid $::inst]
 
   # for windows < 10: make sure the main window is still on top
-  wm attributes . -topmost
+  raise .
 
   chan configure $::inst -buffering line -blocking 1
 

Modified: trunk/Master/tlpkg/tltcl/tltcl.tcl
===================================================================
--- trunk/Master/tlpkg/tltcl/tltcl.tcl	2020-04-27 17:23:52 UTC (rev 54909)
+++ trunk/Master/tlpkg/tltcl/tltcl.tcl	2020-04-27 18:46:48 UTC (rev 54910)
@@ -413,6 +413,7 @@
   # the above works for menu items, ttk::label, text, ttk::entry
   # including current value of ttk::combobox, ttk::combobox list items
   # and non-ttk labels and buttons - which are not used here
+  # apparently, these widget classes use the X11 default font on Linux.
 
   set ::cw \
     [expr {max([font measure TkDefaultFont "0"],[font measure TkTextFont "0"])}]
@@ -554,7 +555,6 @@
   if {$wy < 0} { set wy 0}
   wm geometry $wnd [format "+%d+%d" $wx $wy]
   update idletasks
-  wm attributes $wnd -topmost
   wm state $wnd normal
   raise $wnd $p
   tkwait visibility $wnd