Check-in [bff8537e1b]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:attempt to fix ticket [e3c6fbfa6f], now generating <Leave> on <<FingerUp>>
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: bff8537e1b827f71108e2f12ee41e7cc360617c0
User & Date: chw 2019-07-08 05:03:44
References
2019-07-08
05:04 Closed ticket [e3c6fbfa6f]: Androwish button colors not changing correctly plus 5 other changes artifact: 83484680a0 user: chw
Context
2019-07-08
09:10
add tk upstream changes check-in: dd4e9fa22a user: chw tags: trunk
05:03
attempt to fix ticket [e3c6fbfa6f], now generating <Leave> on <<FingerUp>> check-in: bff8537e1b user: chw tags: trunk
2019-07-07
08:21
cleanup missing pieces in tbcload and tclcompiler check-in: 7a110bb514 user: chw tags: trunk
Changes

Changes to jni/sdl2tk/library/button.tcl.

775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
    }

    set Priv(window) ""
}

if {$::tk::android} {
    bind Checkbutton <<FingerUp>> {
	if {%s == 1} {tk::CheckLeave %W}
    }
    bind Button <<FingerUp>> {
	if {%s == 1} {tk::ButtonLeave %W}
    }
    bind Radiobutton <<FingerUp>> {
	if {%s == 1} {tk::ButtonLeave %W}
    }
}

return
 
# Local Variables:
# mode: tcl
# fill-column: 78
# End:







|


|


|









775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
    }

    set Priv(window) ""
}

if {$::tk::android} {
    bind Checkbutton <<FingerUp>> {
	if {%s == 1} {event generate %W <Leave>}
    }
    bind Button <<FingerUp>> {
	if {%s == 1} {event generate %W <Leave>}
    }
    bind Radiobutton <<FingerUp>> {
	if {%s == 1} {event generate %W <Leave>}
    }
}

return
 
# Local Variables:
# mode: tcl
# fill-column: 78
# End:

Changes to jni/sdl2tk/library/menu.tcl.

86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
    tk::MbEnter %W
}
bind Menubutton <Leave> {
    tk::MbLeave %W
}
if {$::tk::android} {
    bind Menubutton <<FingerUp>> {
	if {%s == 1} {tk::MbLeave %W}
    }
}
bind Menubutton <1> {
    if {$tk::Priv(inMenubutton) ne ""} {
	tk::MbPost $tk::Priv(inMenubutton) %X %Y
    }
}







|







86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
    tk::MbEnter %W
}
bind Menubutton <Leave> {
    tk::MbLeave %W
}
if {$::tk::android} {
    bind Menubutton <<FingerUp>> {
	if {%s == 1} {event generate %W <Leave>}
    }
}
bind Menubutton <1> {
    if {$tk::Priv(inMenubutton) ne ""} {
	tk::MbPost $tk::Priv(inMenubutton) %X %Y
    }
}

Changes to jni/sdl2tk/library/ttk/button.tcl.

21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
bind TButton <Enter> 		{ %W instate !disabled {%W state active} }
bind TButton <Leave>		{ %W state !active }
bind TButton <Key-space>	{ ttk::button::activate %W }
bind TButton <<Invoke>> 	{ ttk::button::activate %W }

if {$::tk::android} {
    bind TButton <<FingerUp>> {
	if {%s == 1} { %W instate active { %W state !active } }
    }
    bind TButton <ButtonPress-1> {
	%W instate !disabled {
	    %W instate !active { %W state active }
	    ttk::clickToFocus %W
	    %W state pressed
	}







|







21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
bind TButton <Enter> 		{ %W instate !disabled {%W state active} }
bind TButton <Leave>		{ %W state !active }
bind TButton <Key-space>	{ ttk::button::activate %W }
bind TButton <<Invoke>> 	{ ttk::button::activate %W }

if {$::tk::android} {
    bind TButton <<FingerUp>> {
	if {%s == 1} { event generate %W <Leave> }
    }
    bind TButton <ButtonPress-1> {
	%W instate !disabled {
	    %W instate !active { %W state active }
	    ttk::clickToFocus %W
	    %W state pressed
	}

Changes to jni/sdl2tk/library/ttk/menubutton.tcl.

48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
bind TMenubutton <Leave>	{ %W state !active }
bind TMenubutton <Key-space> 	{ ttk::menubutton::Popdown %W }
bind TMenubutton <<Invoke>> 	{ ttk::menubutton::Popdown %W }

if {[tk windowingsystem] eq "x11"} {
    if {$::tk::android} {
	bind TMenubutton <<FingerUp>> {
	    if {%s == 1} { %W instate active { %W state !active } }
	}
    }
    bind TMenubutton <ButtonPress-1>  	{ ttk::menubutton::Pulldown %W }
    bind TMenubutton <ButtonRelease-1>	{ ttk::menubutton::TransferGrab %W }
    bind TMenubutton <B1-Leave> 	{ ttk::menubutton::TransferGrab %W }
} else {
    bind TMenubutton <ButtonPress-1>  \







|







48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
bind TMenubutton <Leave>	{ %W state !active }
bind TMenubutton <Key-space> 	{ ttk::menubutton::Popdown %W }
bind TMenubutton <<Invoke>> 	{ ttk::menubutton::Popdown %W }

if {[tk windowingsystem] eq "x11"} {
    if {$::tk::android} {
	bind TMenubutton <<FingerUp>> {
	    if {%s == 1 && [winfo exists %W]} { event generate %W <Leave> }
	}
    }
    bind TMenubutton <ButtonPress-1>  	{ ttk::menubutton::Pulldown %W }
    bind TMenubutton <ButtonRelease-1>	{ ttk::menubutton::TransferGrab %W }
    bind TMenubutton <B1-Leave> 	{ ttk::menubutton::TransferGrab %W }
} else {
    bind TMenubutton <ButtonPress-1>  \