summaryrefslogtreecommitdiffstats
path: root/win/tkWinMenu.c
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2018-09-29 08:00:36 (GMT)
committerfvogel <fvogelnew1@free.fr>2018-09-29 08:00:36 (GMT)
commitea0200f3f7bb5e9837114f2a9f674a9ef330ec2b (patch)
tree4ab6f3cf1dec9624345723f45496201ceb97301b /win/tkWinMenu.c
parent65ba89c907a5b7c966d6ba5904daf97f4e39d199 (diff)
downloadtk-ea0200f3f7bb5e9837114f2a9f674a9ef330ec2b.zip
tk-ea0200f3f7bb5e9837114f2a9f674a9ef330ec2b.tar.gz
tk-ea0200f3f7bb5e9837114f2a9f674a9ef330ec2b.tar.bz2
Once the menu geometry is correctly computed there is no need anymore for questionable hacks in menu width calculation when displaying it
Diffstat (limited to 'win/tkWinMenu.c')
-rw-r--r--win/tkWinMenu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 5dc8f8a..99da158 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -2874,7 +2874,7 @@ TkpComputeStandardMenuGeometry(
menuPtr->entries[j]->entryFlags &= ~ENTRY_LAST_COLUMN;
}
x += indicatorSpace + labelWidth + accelWidth
- + 2 * borderWidth;
+ + 2 * activeBorderWidth;
indicatorSpace = labelWidth = accelWidth = 0;
lastColumnBreak = i;
y = borderWidth;
@@ -2944,8 +2944,8 @@ TkpComputeStandardMenuGeometry(
menuPtr->entries[j]->x = x;
menuPtr->entries[j]->entryFlags |= ENTRY_LAST_COLUMN;
}
- windowWidth = x + indicatorSpace + labelWidth + accelWidth + accelSpace
- + 2 * activeBorderWidth + 2 * borderWidth;
+ windowWidth = x + indicatorSpace + labelWidth + accelWidth
+ + 2 * activeBorderWidth + borderWidth;
windowHeight += borderWidth;