diff options
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/texmf-dist/scripts/tlshell/tlshell.tcl | 4 | ||||
| -rwxr-xr-x | Master/tlpkg/installer/install-tl-gui.tcl | 8 | ||||
| -rw-r--r-- | Master/tlpkg/tltcl/tltcl.tcl | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Master/texmf-dist/scripts/tlshell/tlshell.tcl b/Master/texmf-dist/scripts/tlshell/tlshell.tcl index a78f494655c..3b2b53b1c9e 100755 --- a/Master/texmf-dist/scripts/tlshell/tlshell.tcl +++ b/Master/texmf-dist/scripts/tlshell/tlshell.tcl @@ -2184,6 +2184,8 @@ proc populate_main {} { .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 @@ proc populate_main {} { 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 @@ proc initialize {} { get_packages_info_local collect_filtered get_repos_from_tlmgr - rebuild_interface }; # initialize initialize 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 diff --git a/Master/tlpkg/tltcl/tltcl.tcl b/Master/tlpkg/tltcl/tltcl.tcl index e95f919d7f1..7af693b5649 100644 --- a/Master/tlpkg/tltcl/tltcl.tcl +++ b/Master/tlpkg/tltcl/tltcl.tcl @@ -413,6 +413,7 @@ proc redo_fonts {} { # 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 @@ proc place_dlg {wnd {p "."}} { 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 |