winemac: WS_EX_DLGMODALFRAME shouldn't prevent the window being resizeable.

Ken Thomases ken at codeweavers.com
Thu Nov 13 10:16:48 CST 2014


On Nov 13, 2014, at 10:00 AM, Ken Thomases <ken at codeweavers.com> wrote:

> Hi,
> 
> On Nov 13, 2014, at 3:26 AM, Huw Davies <huw at codeweavers.com> wrote:
> 
>> ---
>> dlls/winemac.drv/window.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
>> index e61a517..54bd56e 100644
>> --- a/dlls/winemac.drv/window.c
>> +++ b/dlls/winemac.drv/window.c
>> @@ -72,12 +72,12 @@ static void get_cocoa_window_features(struct macdrv_win_data *data,
>>            if (ex_style & WS_EX_TOOLWINDOW) wf->utility = TRUE;
>>        }
>>    }
>> -    if (ex_style & WS_EX_DLGMODALFRAME) wf->shadow = TRUE;
>> -    else if (style & WS_THICKFRAME)
>> +    if (style & WS_THICKFRAME)
>>    {
>>        wf->shadow = TRUE;
>>        if (!data->shaped) wf->resizable = TRUE;
>>    }
>> +    else if (ex_style & WS_EX_DLGMODALFRAME) wf->shadow = TRUE;
>>    else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) wf->shadow = TRUE;
>> }
> 
> I think that's the correct logic, but it would be better to separate out setting resizable and shadow.  The shadow stuff can be a single "if" with the conditions ORed together.  Resizable can be a single "if" or even a simple assignment of a boolean expression.

Er, too late it seems.  Never mind then. :)

-Ken




More information about the wine-devel mailing list