TIP #533 (Extension of the menu post command) implementation was accepted by TCT vote. This allows fixing of bug [70e531918e]: geometry issues with menubuttons on macOS.

1 files changed, 15 insertions, 11 deletions

diff --git a/tests/menubut.test b/tests/menubut.test
index d7ff2e3..a9d0656 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -542,7 +542,11 @@ test menubutton-6.1 {MenuButtonCmdDeletedProc procedure} -setup {
     deleteWindows
 } -result {{} {}}
 
-
+if {[tk windowingsystem] == "aqua"} {
+    set extraWidth 36
+} else {
+    set extraWidth 0
+}
 test menubutton-7.1 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType
 } -setup {
@@ -555,33 +559,33 @@ test menubutton-7.1 {ComputeMenuButtonGeometry procedure} -constraints {
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {38 23}
+} -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.2 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType
 } -setup {
     deleteWindows
     image create test image1
 } -body {
-    menubutton .mb -image image1 -bd 1 -highlightthickness 2
+    menubutton .mb -image image1 -bd 3 -highlightthickness 1
     pack .mb
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {36 21}
+} -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.3 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType
 } -setup {
     deleteWindows
     image create test image1
 } -body {
-    menubutton .mb -image image1 -bd 0 -highlightthickness 2 -padx 5 -pady 5
+    menubutton .mb -image image1 -bd 1 -highlightthickness 3 -padx 5 -pady 5
     pack .mb
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {34 19}
+} -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.4 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType
 } -setup {
@@ -595,7 +599,7 @@ test menubutton-7.4 {ComputeMenuButtonGeometry procedure} -constraints {
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {48 23}
+} -result [list [expr {48 + $extraWidth}] 23]
 test menubutton-7.5 {ComputeMenuButtonGeometry procedure} -constraints {
     testImageType
 } -setup {
@@ -609,7 +613,7 @@ test menubutton-7.5 {ComputeMenuButtonGeometry procedure} -constraints {
 } -cleanup {
     deleteWindows
     imageCleanup
-} -result {38 38}
+} -result [list [expr {38 + $extraWidth}] 38]
 test menubutton-7.6 {ComputeMenuButtonGeometry procedure} -setup {
     deleteWindows
 } -body {
@@ -619,7 +623,7 @@ test menubutton-7.6 {ComputeMenuButtonGeometry procedure} -setup {
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
-} -result {25 35}
+} -result [list [expr {25 + $extraWidth}] 35]
 test menubutton-7.7 {ComputeMenuButtonGeometry procedure} -setup {
     deleteWindows
 } -body {
@@ -629,7 +633,7 @@ test menubutton-7.7 {ComputeMenuButtonGeometry procedure} -setup {
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
-} -result {46 33}
+} -result [list [expr {46 + $extraWidth}] 33]
 test menubutton-7.8 {ComputeMenuButtonGeometry procedure} -setup {
     deleteWindows
 } -body {
@@ -639,7 +643,7 @@ test menubutton-7.8 {ComputeMenuButtonGeometry procedure} -setup {
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } -cleanup {
     deleteWindows
-} -result {23 56}
+} -result [list [expr {23 + $extraWidth}] 56]
 test menubutton-7.9 {ComputeMenuButtonGeometry procedure} -constraints {
     fonts
 } -setup {