summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2022-07-20 19:03:27 (GMT)
committerfvogel <fvogelnew1@free.fr>2022-07-20 19:03:27 (GMT)
commit29d216867f25b001b73a068063080576ac5b5f5f (patch)
tree9c9645c5758b869c560a96d8615d4077495ca0cb
parent6cacb770e6ac9645e062cbbc306367d2bea40d7a (diff)
downloadtk-29d216867f25b001b73a068063080576ac5b5f5f.zip
tk-29d216867f25b001b73a068063080576ac5b5f5f.tar.gz
tk-29d216867f25b001b73a068063080576ac5b5f5f.tar.bz2
Improve the fix with a patch from Koen Danckaert.
-rw-r--r--library/menu.tcl18
1 files changed, 15 insertions, 3 deletions
diff --git a/library/menu.tcl b/library/menu.tcl
index 405bb36..03057c1 100644
--- a/library/menu.tcl
+++ b/library/menu.tcl
@@ -285,7 +285,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} {
GenerateMenuSelect $menu
update idletasks
- if {[catch {PostMenubuttonMenu $w $menu} msg opt]} {
+ if {[catch {PostMenubuttonMenu $w $menu $x $y} msg opt]} {
# Error posting menu (e.g. bogus -postcommand). Unpost it and
# reflect the error.
MenuUnpost {}
@@ -1138,7 +1138,7 @@ proc ::tk::MenuFindName {menu s} {
# side. On other platforms the entry is centered over the button.
if {[tk windowingsystem] eq "aqua"} {
- proc ::tk::PostMenubuttonMenu {button menu} {
+ proc ::tk::PostMenubuttonMenu {button menu cx cy} {
set entry ""
if {[$button cget -indicatoron]} {
set entry [MenuFindName $menu [$button cget -text]]
@@ -1170,7 +1170,7 @@ if {[tk windowingsystem] eq "aqua"} {
PostOverPoint $menu $x $y $entry
}
} else {
- proc ::tk::PostMenubuttonMenu {button menu} {
+ proc ::tk::PostMenubuttonMenu {button menu cx cy} {
set entry ""
if {[$button cget -indicatoron]} {
set entry [MenuFindName $menu [$button cget -text]]
@@ -1211,6 +1211,18 @@ if {[tk windowingsystem] eq "aqua"} {
incr x [expr {[winfo width $button]}]
}
default { # flush
+ if {[$button cget -indicatoron]} {
+ if {$cx ne ""} {
+ set x [expr {$cx - [winfo reqwidth $menu] / 2}]
+ set l [font metrics [$menu cget -font] -linespace]
+ set y [expr {$cy - $l/2 - 2}]
+ } else {
+ incr x [expr {([winfo width $button] - \
+ [winfo reqwidth $menu])/ 2}]
+ }
+ } else {
+ incr y [winfo height $button]
+ }
}
}
PostOverPoint $menu $x $y $entry