smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-11 16:06:25 +01:00
Code Issues Projects Releases Wiki Activity

update fullscreen patch to restore title on Lion

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@13573 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-11-30 19:22:50 +00:00
parent 7d302c5d5b
commit 7b1d4a9692
1 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tools/current-gtk-patches/gdk-fullscreen.patch
View file

@ -1,8 +1,34 @@
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 792092e..3f7cd77 100644
index 792092e..3455461 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2714,18 +2714,30 @@ gdk_window_set_decorations (GdkWindow *window,
@@ -2704,28 +2704,53 @@ gdk_window_set_decorations (GdkWindow *window,
rect = [NSWindow contentRectForFrameRect:rect styleMask:old_mask];
}
- /* Note, before OS 10.6 there doesn't seem to be a way to change this without
- * recreating the toplevel. There might be bad side-effects of doing
- * that, but it seems alright.
+ /* Before OS 10.6 there doesn't seem to be a way to change this without
+ * recreating the toplevel. From 10.6 onward, a simple call to setStyleMask
+ * takes care of most of this, except for ensuring that the title is set.
*/
if ([impl->toplevel respondsToSelector:@selector(setStyleMask:)])
{
+ NSString* title = [impl->toplevel title];
+
[(id<CanSetStyleMask>)impl->toplevel setStyleMask:new_mask];
+
+ /* It appears that unsetting and then resetting NSTitleMask does
+ not reset the title in the title bar as might be expected.
+
+ In theory we only need set this if new_mask includes NSTitledMask.
+ This behaved extremely oddly when conditionalized upon that
+ and since it has no side effects (i.e. if NSTitleMask is not
+ requested, the title will not be displayed, just do it
+ unconditionally.
+ */
+ [impl->toplevel setTitle:title];
}
else
{
@ -35,7 +61,7 @@ index 792092e..3f7cd77 100644
/* Invalidate the window shadow for non-opaque views that have shadow
* enabled, to get the shadow shape updated.
@@ -2921,6 +2933,7 @@ gdk_window_fullscreen (GdkWindow *window)
@@ -2921,6 +2946,7 @@ gdk_window_fullscreen (GdkWindow *window)
{
FullscreenSavedGeometry *geometry;
GdkWindowObject *private = (GdkWindowObject *) window;
@ -43,7 +69,7 @@ index 792092e..3f7cd77 100644
NSRect frame;
if (GDK_WINDOW_DESTROYED (window) ||
@@ -2946,10 +2959,14 @@ gdk_window_fullscreen (GdkWindow *window)
@@ -2946,10 +2972,14 @@ gdk_window_fullscreen (GdkWindow *window)
gdk_window_set_decorations (window, 0);
@ -59,7 +85,7 @@ index 792092e..3f7cd77 100644
}
SetSystemUIMode (kUIModeAllHidden, kUIOptionAutoShowMenuBar);
@@ -2960,6 +2977,8 @@ gdk_window_fullscreen (GdkWindow *window)
@@ -2960,6 +2990,8 @@ gdk_window_fullscreen (GdkWindow *window)
void
gdk_window_unfullscreen (GdkWindow *window)
{
@ -68,7 +94,7 @@ index 792092e..3f7cd77 100644
FullscreenSavedGeometry *geometry;
if (GDK_WINDOW_DESTROYED (window) ||
@@ -2981,6 +3000,8 @@ gdk_window_unfullscreen (GdkWindow *window)
@@ -2981,6 +3013,8 @@ gdk_window_unfullscreen (GdkWindow *window)
g_object_set_data (G_OBJECT (window), FULLSCREEN_DATA, NULL);