From eaacd364b6197fcd8a79cdf57876d551575f9096 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Thu, 9 Oct 2008 11:30:10 +0000 Subject: [PATCH] Merged from trunk: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-10-09 Richard Hult Merged from trunk: Bug 550342 – Splash screens have a caption * gdk/quartz/gdkwindow-quartz.c: (_gdk_window_new), (gdk_window_set_decorations): Patch from Marianne Gagnon to make splash windows borderless. svn path=/branches/gtk-2-14/; revision=21618 --- ChangeLog | 10 ++++++++++ gdk/quartz/gdkwindow-quartz.c | 12 +++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 918479bb95..342893a34e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-10-09 Richard Hult + + Merged from trunk: + + Bug 550342 – Splash screens have a caption + + * gdk/quartz/gdkwindow-quartz.c: (_gdk_window_new), + (gdk_window_set_decorations): Patch from Marianne Gagnon to make + splash windows borderless. + 2008-10-09 Simos Xenitellis Bug 554192 – double press on the "circumflex" dead key diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 551212ebfe..b02ad32f93 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -1016,12 +1016,13 @@ _gdk_window_new (GdkWindow *parent, content_rect = NSMakeRect (-500 - impl->width, -500 - impl->height, impl->width, impl->height); - switch (attributes->window_type) + if (attributes->window_type == GDK_WINDOW_TEMP || + attributes->type_hint == GDK_WINDOW_TYPE_HINT_SPLASHSCREEN) { - case GDK_WINDOW_TEMP: style_mask = NSBorderlessWindowMask; - break; - default: + } + else + { style_mask = (NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | @@ -2733,7 +2734,8 @@ gdk_window_set_decorations (GdkWindow *window, impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl); - if (decorations == 0 || GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP) + if (decorations == 0 || GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP || + impl->type_hint == GDK_WINDOW_TYPE_HINT_SPLASHSCREEN ) { new_mask = NSBorderlessWindowMask; }