From 3e9e014c35b9feb948e7f4bf082a9ec5d45c05a2 Mon Sep 17 00:00:00 2001
From: Siep Kroonenberg <siepo@cybercomm.nl>
Date: Mon, 27 Apr 2020 18:46:48 +0000
Subject: Tcl GUIs: show again actual scaling in menu. Removed spurious
 'attributes -topmost' statements

git-svn-id: svn://tug.org/texlive/trunk@54910 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/installer/install-tl-gui.tcl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'Master/tlpkg/installer')

diff --git a/Master/tlpkg/installer/install-tl-gui.tcl b/Master/tlpkg/installer/install-tl-gui.tcl
index 2a2f10896ff..0e94d6ab1c5 100755
--- a/Master/tlpkg/installer/install-tl-gui.tcl
+++ b/Master/tlpkg/installer/install-tl-gui.tcl
@@ -393,7 +393,6 @@ proc select_mirror {} {
   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 @@ If this takes too long, press Abort or choose another repository." \
                                           $::prelocation]] -in .bg
   }
 
-  wm attributes . -topmost
   update
   wm state . normal
   raise .
@@ -466,7 +464,6 @@ proc show_log {{do_abort 0}} {
 
   wm resizable . 1 1
   wm overrideredirect . 0
-  wm attributes . -topmost
   update
   wm state . normal
   raise .
@@ -1399,6 +1396,8 @@ proc run_menu {} {
 
   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 @@ proc run_menu {} {
   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 @@ proc main_prog {} {
   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
 
-- 
cgit v1.2.3