Skip to content

Commit d7a2f2a

Browse files
committed
[[ Bug 12264 ]] Make sure we check correct setting of WD_MAXIMIZE decoration, and use F_RESIZABLE flag at appropriate place when window created.
1 parent 927b3f8 commit d7a2f2a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

docs/notes/bugfix-12264.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# resizable and maximize decorations not honoured correctly on Mac.

engine/src/desktop-stack.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ void MCStack::realize(void)
112112
t_has_titlebox = (decorations & WD_TITLE) != 0;
113113
t_has_closebox = (decorations & WD_CLOSE) != 0;
114114
t_has_collapsebox = (decorations & WD_MINIMIZE) != 0;
115-
t_has_zoombox = (decorations & WD_MAXIMIZE) == 0;
116-
t_has_sizebox = getflag(F_RESIZABLE);
115+
116+
// MW-2014-04-22: [[ Bug 12264 ]] Wrong test for maximize (was == 0!).
117+
t_has_zoombox = (decorations & WD_MAXIMIZE) != 0;
117118
}
118119
else
119120
{
@@ -137,6 +138,10 @@ void MCStack::realize(void)
137138
t_has_titlebox = true;
138139
}
139140

141+
// MW-2014-04-22: [[ Bug 12264 ]] Make sure we use the resizable property in all cases, to be
142+
// switched off for certain window types.
143+
t_has_sizebox = getflag(F_RESIZABLE);
144+
140145
if (getflag(F_DECORATIONS) && ((decorations & (WD_TITLE | WD_MENU | WD_CLOSE | WD_MINIMIZE | WD_MAXIMIZE)) == 0))
141146
t_has_sizebox = false;
142147

0 commit comments

Comments
 (0)