From 2e355f70ace81b18ef77f3fdc45f347326165c08 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 24 May 2016 14:59:02 +0100 Subject: [PATCH 1/1] orientation-related changes, found --- applet.tcl | 26 ++++++++++++++++++++++---- example | 3 ++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/applet.tcl b/applet.tcl index 57270a2..93e9c31 100644 --- a/applet.tcl +++ b/applet.tcl @@ -194,10 +194,27 @@ variable h 50 variable deforient horizontal variable border_colour darkblue variable border_width 1 +variable tray_width X +variable tray_height X +variable orientation vertical -proc subwindow-need-recreate {} { +proc subwindow-need-recreate {evtype why} { + variable orientation variable innerwindow_after - debug::debug "IW-EVENT" + variable tray_width + variable tray_height + debug::debug "IW-EVENT $evtype $why [winfo reqwidth .i] [winfo reqheight .i] [winfo width .i] [winfo height .i] $orientation" + switch -exact $orientation { + horizontal { set szv height } + vertical { set szv width } + unknown { return } + } + set new_sz [winfo req$szv .i] + if {![string compare $new_sz [set tray_$szv]]} { + return + } + set tray_$szv $new_sz +# switch -exact -- $evtype 35 { return } if {[info exists innerwindow_after]} return set innerwindow_after [after idle applet::innerwindow-resetup] } @@ -209,6 +226,7 @@ proc innerwindow-resetup {} { variable border_colour variable border_width variable deforient + variable orientation unset innerwindow_after debug::debug RESETUP @@ -247,7 +265,7 @@ proc setup-subwindow {on_destroying on_ready} { destroy [frame .i.make-exist] destroy [frame .i.i.make-exist] bind .i <> { - applet::subwindow-need-recreate + applet::subwindow-need-recreate %T "%T i=%i k=%K N=%N R=%R S=%S k=%k m=%m d=%d s=%s a=%a b=%b c=%c f=%f w,h=%w,%h o=%o p=%p t=%t x,y=%x,%y B=%B D=%D E=%E P=%P W=%W X,Y=%X,%Y" } } @@ -333,7 +351,7 @@ proc child-died {how how2} { } default { set subproc none - subwindow-need-recreate + subwindow-need-recreate child-died child-died } } } diff --git a/example b/example index bd05b17..2d07e86 100755 --- a/example +++ b/example @@ -6,8 +6,9 @@ source applet.tcl source subproc.tcl +source utils.tcl -applet::setup-debug puts +set debug::debug puts foreach b {1 3} { applet::setup-button-menu $b -- 2.30.2