wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Jacek Caban : mshtml: Added more parser compatMode tests.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: ae56273c46e6853616f0b01003a963af64361743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae56273c46e6853616f0b0100… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 17 12:34:45 2013 +0200 mshtml: Added more parser compatMode tests. --- dlls/mshtml/tests/dom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d4693ae..da44190 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7439,6 +7439,7 @@ static void test_quirks_mode(void) { run_domtest("<html></html>", check_quirks_mode); run_domtest("<!DOCTYPE html>\n<html></html>", check_strict_mode); + run_domtest("<!DOCTYPE html>\n<html></html>", check_quirks_mode); } START_TEST(dom)

1 0

Alistair Leslie-Hughes : oledb32: Support VT_NULL when converting to DBTYPE_BSTR.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: d3c3a38f692756b73b9bb1cedbcf22dcbea8be7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c3a38f692756b73b9bb1ced… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 17 12:21:12 2013 +1000 oledb32: Support VT_NULL when converting to DBTYPE_BSTR. --- dlls/oledb32/convert.c | 15 ++++++++++++--- dlls/oledb32/tests/convert.c | 8 ++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 19f46f6..af603e4 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -534,9 +534,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; case DBTYPE_VARIANT: - VariantInit(&tmp); - if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) - *d = V_BSTR(&tmp); + if(V_VT((VARIANT*)src) == VT_NULL) + { + *dst_status = DBSTATUS_S_ISNULL; + *dst_len = get_length(DBTYPE_BSTR); + return S_OK; + } + else + { + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + *d = V_BSTR(&tmp); + } break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 90e1658..6f02899 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -977,6 +977,14 @@ static void test_converttobstr(void) ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); SysFreeString(dst); SysFreeString(b); + + V_VT(&v) = VT_NULL; + dst = (void*)0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == sizeof(BSTR), "got %ld\n", dst_len); + ok(dst == (void*)0x1234, "got %p\n", dst); } static void test_converttowstr(void)

1 0

Ken Thomases : winemac: Order front in -makeKeyAndOrderFront:; we only override to control key status.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: c8d4b1cc5e9d69a8dc0e6150d768fc2b02b5ad6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d4b1cc5e9d69a8dc0e6150d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:50 2013 -0500 winemac: Order front in -makeKeyAndOrderFront:; we only override to control key status. When we have windows on two different spaces and the user switches between them by clicking our Dock icon, Cocoa inexplicably sends the switched-to window to the back of the z-order. It's only -makeKeyAndOrderFront: that brings it forward again, but our override broke that. --- dlls/winemac.drv/cocoa_window.m | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index cec86b5..d2b2547 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1051,8 +1051,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* We don't call this. It's the action method of the items in the Window menu. */ - (void) makeKeyAndOrderFront:(id)sender { + WineApplicationController* controller = [WineApplicationController sharedController]; + WineWindow* front = [controller frontWineWindow]; + if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [[WineApplicationController sharedController] windowGotFocus:self]; + [controller windowGotFocus:self]; + + if (front && [self level] < [front level]) + [self setLevel:[front level]]; + [self orderFront:nil]; + [controller adjustWindowLevels]; } - (void) sendEvent:(NSEvent*)event

1 0

Ken Thomases : winemac: Don't reorder windows if they' re already ordered as requested.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: ef874a8eaa7660a5bbbc762f2f396e0f831280d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef874a8eaa7660a5bbbc762f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:44 2013 -0500 winemac: Don't reorder windows if they're already ordered as requested. This avoids adjusting window levels. It also avoid unnecessarily deinterleaving the windows of this and other processes. --- dlls/winemac.drv/cocoa_window.m | 74 ++++++++++++++++++++++++++++++++++---- 1 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 16244e8..cec86b5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -657,6 +657,55 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) forWindow:self]; } + // Determine if, among Wine windows, this window is directly above or below + // a given other Wine window with no other Wine window intervening. + // Intervening non-Wine windows are ignored. + - (BOOL) isOrdered:(NSWindowOrderingMode)orderingMode relativeTo:(WineWindow*)otherWindow + { + NSNumber* windowNumber; + NSNumber* otherWindowNumber; + NSArray* windowNumbers; + NSUInteger windowIndex, otherWindowIndex, lowIndex, highIndex, i; + + if (![self isVisible] || ![otherWindow isVisible]) + return FALSE; + + windowNumber = [NSNumber numberWithInteger:[self windowNumber]]; + otherWindowNumber = [NSNumber numberWithInteger:[otherWindow windowNumber]]; + windowNumbers = [[self class] windowNumbersWithOptions:0]; + windowIndex = [windowNumbers indexOfObject:windowNumber]; + otherWindowIndex = [windowNumbers indexOfObject:otherWindowNumber]; + + if (windowIndex == NSNotFound || otherWindowIndex == NSNotFound) + return FALSE; + + if (orderingMode == NSWindowAbove) + { + lowIndex = windowIndex; + highIndex = otherWindowIndex; + } + else if (orderingMode == NSWindowBelow) + { + lowIndex = otherWindowIndex; + highIndex = windowIndex; + } + else + return FALSE; + + if (highIndex <= lowIndex) + return FALSE; + + for (i = lowIndex + 1; i < highIndex; i++) + { + NSInteger interveningWindowNumber = [[windowNumbers objectAtIndex:i] integerValue]; + NSWindow* interveningWindow = [NSApp windowWithWindowNumber:interveningWindowNumber]; + if ([interveningWindow isKindOfClass:[WineWindow class]]) + return FALSE; + } + + return TRUE; + } + /* Returns whether or not the window was ordered in, which depends on if its frame intersects any screen. */ - (BOOL) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next @@ -665,6 +714,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) BOOL on_screen = frame_intersects_screens([self frame], [NSScreen screens]); if (on_screen) { + BOOL needAdjustWindowLevels = FALSE; + [controller transformProcessToForeground]; NSDisableScreenUpdates(); @@ -675,19 +726,24 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setLevel:[latentParentWindow level]]; [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; self.latentParentWindow = nil; + needAdjustWindowLevels = TRUE; } if (prev || next) { WineWindow* other = [prev isVisible] ? prev : next; NSWindowOrderingMode orderingMode = [prev isVisible] ? NSWindowBelow : NSWindowAbove; - // This window level may not be right for this window based - // on floating-ness, fullscreen-ness, etc. But we set it - // temporarily to allow us to order the windows properly. - // Then the levels get fixed by -adjustWindowLevels. - if ([self level] != [other level]) - [self setLevel:[other level]]; - [self orderWindow:orderingMode relativeTo:[other windowNumber]]; + if (![self isOrdered:orderingMode relativeTo:other]) + { + // This window level may not be right for this window based + // on floating-ness, fullscreen-ness, etc. But we set it + // temporarily to allow us to order the windows properly. + // Then the levels get fixed by -adjustWindowLevels. + if ([self level] != [other level]) + [self setLevel:[other level]]; + [self orderWindow:orderingMode relativeTo:[other windowNumber]]; + needAdjustWindowLevels = TRUE; + } } else { @@ -697,8 +753,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (next && [self level] < [next level]) [self setLevel:[next level]]; [self orderFront:nil]; + needAdjustWindowLevels = TRUE; } - [controller adjustWindowLevels]; + if (needAdjustWindowLevels) + [controller adjustWindowLevels]; NSEnableScreenUpdates();

1 0

Ken Thomases : winemac: In -setFrameIfOnScreen:, don' t adjust window levels if fullscreen-ness didn't change.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 7a047af6404585f7eeb5b402ea45b6950e635947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a047af6404585f7eeb5b402e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:40 2013 -0500 winemac: In -setFrameIfOnScreen:, don't adjust window levels if fullscreen-ness didn't change. --- dlls/winemac.drv/cocoa_window.m | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ae5f40b..16244e8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -762,7 +762,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (on_screen) { - [[WineApplicationController sharedController] adjustWindowLevels]; + BOOL fullscreen = (screen_covered_by_rect(frame, screens) != nil); + BOOL oldFullscreen = (screen_covered_by_rect(oldFrame, screens) != nil); + + if (fullscreen != oldFullscreen) + [[WineApplicationController sharedController] adjustWindowLevels]; /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */

1 0

Ken Thomases : winemac: In -setFrameIfOnScreen:, avoid some work if the frame didn't change.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 94746f1d2dfc2067b95548cce329e913b70181e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94746f1d2dfc2067b95548cce… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:37 2013 -0500 winemac: In -setFrameIfOnScreen:, avoid some work if the frame didn't change. --- dlls/winemac.drv/cocoa_window.m | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 57d6e5d..ae5f40b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -727,7 +727,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { NSArray* screens = [NSScreen screens]; BOOL on_screen = [self isOrderedIn]; - NSRect frame, oldFrame; if (![screens count]) return on_screen; @@ -742,8 +741,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self doOrderOut]; } + /* The back end is establishing a new window size and position. It's + not interested in any stale events regarding those that may be sitting + in the queue. */ + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_FRAME_CHANGED) + forWindow:self]; + if (!NSIsEmptyRect(contentRect)) { + NSRect frame, oldFrame; + oldFrame = [self frame]; frame = [self frameRectForContentRect:contentRect]; if (!NSEqualRects(frame, oldFrame)) @@ -752,24 +759,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setFrameOrigin:frame.origin]; else [self setFrame:frame display:YES]; - } - } - if (on_screen) - { - [[WineApplicationController sharedController] adjustWindowLevels]; + if (on_screen) + { + [[WineApplicationController sharedController] adjustWindowLevels]; - /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed - event. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; - } - else - { - /* The back end is establishing a new window size and position. It's - not interested in any stale events regarding those that may be sitting - in the queue. */ - [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_FRAME_CHANGED) - forWindow:self]; + /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed + event. The back end will ignore it if nothing actually changed. */ + [self windowDidResize:nil]; + } + } } return on_screen;

1 0

Ken Thomases : winemac: Centralize adjusting of window levels using the window server's z-order.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 27510fae8e9c77dcdd3fb922a5eed2b98950fc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27510fae8e9c77dcdd3fb922a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:33 2013 -0500 winemac: Centralize adjusting of window levels using the window server's z-order. --- dlls/winemac.drv/cocoa_app.h | 7 +- dlls/winemac.drv/cocoa_app.m | 198 +++++++++++++++++++++++--------------- dlls/winemac.drv/cocoa_window.h | 5 +- dlls/winemac.drv/cocoa_window.m | 200 +++++++++++++-------------------------- 4 files changed, 186 insertions(+), 224 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27510fae8e9c77dcdd3fb…

1 0

Ken Thomases : winemac: Use window server' s window list to find next window to offer focus to.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 0d4a26eff5b0765dc3ae8ad4562b1f1d6c8998cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4a26eff5b0765dc3ae8ad45… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:28 2013 -0500 winemac: Use window server's window list to find next window to offer focus to. ... rather than our orderedWineWindows array, which is going away. --- dlls/winemac.drv/cocoa_app.m | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 67984cd..74eff00 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -322,9 +322,21 @@ int macdrv_err_on; { if (event->window_got_focus.serial == windowFocusSerial) { + NSMutableArray* windows = [keyWindows mutableCopy]; + NSNumber* windowNumber; + WineWindow* window; + + for (windowNumber in [NSWindow windowNumbersWithOptions:NSWindowNumberListAllSpaces]) + { + window = (WineWindow*)[NSApp windowWithWindowNumber:[windowNumber integerValue]]; + if ([window isKindOfClass:[WineWindow class]] && [window screen] && + ![windows containsObject:window]) + [windows addObject:window]; + } + triedWindows = (NSMutableSet*)event->window_got_focus.tried_windows; [triedWindows addObject:(WineWindow*)event->window]; - for (NSWindow* window in [keyWindows arrayByAddingObjectsFromArray:[self orderedWineWindows]]) + for (window in windows) { if (![triedWindows containsObject:window] && [window canBecomeKeyWindow]) { @@ -333,6 +345,7 @@ int macdrv_err_on; } } triedWindows = nil; + [windows release]; } }

1 0

Ken Thomases : winemac: Set up window' s latent parent-child relationship before ordering the window.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 8343e7ce4dcf91faf2265e10d52e750e3ca5d5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8343e7ce4dcf91faf2265e10d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:31 2013 -0500 winemac: Set up window's latent parent-child relationship before ordering the window. Making a window a child reorders it to be immediately above or below its parent, potentially undoing the ordering we had just done. --- dlls/winemac.drv/cocoa_window.m | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a7b27a6..717bcf6 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -697,6 +697,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { [controller transformProcessToForeground]; + if (latentParentWindow) + { + if ([latentParentWindow level] > [self level]) + [self setLevelWhenActive:[latentParentWindow level]]; + [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + [controller wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; + self.latentParentWindow = nil; + } if (prev) { /* Make sure that windows that should be above this one really are. @@ -728,14 +736,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self orderWindow:NSWindowAbove relativeTo:[next windowNumber]]; [controller wineWindow:self ordered:NSWindowAbove relativeTo:next]; } - if (latentParentWindow) - { - if ([latentParentWindow level] > [self level]) - [self setLevelWhenActive:[latentParentWindow level]]; - [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; - [controller wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; - self.latentParentWindow = nil; - } /* Cocoa may adjust the frame when the window is ordered onto the screen. Generate a frame-changed event just in case. The back end will ignore @@ -922,11 +922,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } if (activate) [NSApp activateIgnoringOtherApps:YES]; - [self orderFront:nil]; - [controller wineWindow:self ordered:NSWindowAbove relativeTo:nil]; - causing_becomeKeyWindow = TRUE; - [self makeKeyWindow]; - causing_becomeKeyWindow = FALSE; if (latentParentWindow) { if ([latentParentWindow level] > [self level]) @@ -935,6 +930,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [controller wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; self.latentParentWindow = nil; } + [self orderFront:nil]; + [controller wineWindow:self ordered:NSWindowAbove relativeTo:nil]; + causing_becomeKeyWindow = TRUE; + [self makeKeyWindow]; + causing_becomeKeyWindow = FALSE; if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO];

1 0

Ken Thomases : winemac: Consider minimized windows as "on screen" for our purposes.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 6d4098ebd30897833589efa2f5f040ae85a6f673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4098ebd30897833589efa2f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:25 2013 -0500 winemac: Consider minimized windows as "on screen" for our purposes. --- dlls/winemac.drv/cocoa_window.m | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 6bc6183..a7b27a6 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -573,6 +573,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setHasShadow:wf->shadow]; } + - (BOOL) isOrderedIn + { + return [self isVisible] || [self isMiniaturized]; + } + - (void) adjustWindowLevel { WineApplicationController* controller = [WineApplicationController sharedController]; @@ -619,14 +624,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) Also, any windows which are supposed to be in front of it had better have the same or higher window level. If not, bump them up. */ - if (index != NSNotFound && [self isVisible]) + if (index != NSNotFound && [self isOrderedIn]) { for (; index > 0; index--) { other = [[controller orderedWineWindows] objectAtIndex:index - 1]; if ([other level] < level) [other setLevelWhenActive:level]; - else + else if ([self isVisible]) { [self orderWindow:NSWindowBelow relativeTo:[other windowNumber]]; break; @@ -654,13 +659,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (state->excluded_by_cycle) { behavior |= NSWindowCollectionBehaviorIgnoresCycle; - if ([self isVisible]) + if ([self isOrderedIn]) [NSApp removeWindowsItem:self]; } else { behavior |= NSWindowCollectionBehaviorParticipatesInCycle; - if ([self isVisible]) + if ([self isOrderedIn]) [NSApp addWindowsItem:self title:[self title] filename:NO]; } [self setCollectionBehavior:behavior]; @@ -756,7 +761,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (BOOL) setFrameIfOnScreen:(NSRect)contentRect { NSArray* screens = [NSScreen screens]; - BOOL on_screen = [self isVisible]; + BOOL on_screen = [self isOrderedIn]; NSRect frame, oldFrame; if (![screens count]) return on_screen; @@ -892,7 +897,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* If a borderless window is offscreen, orderFront: won't move it onscreen like it would for a titled window. Do that ourselves. */ screens = [NSScreen screens]; - if (!([self styleMask] & NSTitledWindowMask) && ![self isVisible] && + if (!([self styleMask] & NSTitledWindowMask) && ![self isOrderedIn] && !frame_intersects_screens([self frame], screens)) { NSScreen* primaryScreen = [screens objectAtIndex:0]; @@ -1482,7 +1487,7 @@ void macdrv_set_cocoa_window_title(macdrv_window w, const unsigned short* title, titleString = @""; OnMainThreadAsync(^{ [window setTitle:titleString]; - if ([window isVisible] && ![window isExcludedFromWindowsMenu]) + if ([window isOrderedIn] && ![window isExcludedFromWindowsMenu]) [NSApp changeWindowsItem:window title:titleString filename:NO]; });

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013