AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Only apply type hint if it would map to a different mir surface type

Browse Source 
Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
This commit is contained in:
Andreas Pokorny 2016-07-12 16:25:01 +02:00 committed by William Hua
parent da17eae747
commit f95d270372
1 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gdk/mir/gdkmirwindowimpl.c
View File

@ -106,6 +106,46 @@ static cairo_surface_t *gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window
static void ensure_surface (GdkWindow *window);
static void apply_geometry_hints (MirSurfaceSpec *spec, GdkMirWindowImpl *impl);
static gboolean
type_hint_differs (GdkWindowTypeHint lhs, GdkWindowTypeHint rhs)
{
if (lhs == rhs)
return FALSE;
switch (lhs)
{
case GDK_WINDOW_TYPE_HINT_DIALOG:
case GDK_WINDOW_TYPE_HINT_DOCK:
return rhs != GDK_WINDOW_TYPE_HINT_DIALOG &&
rhs != GDK_WINDOW_TYPE_HINT_DOCK;
case GDK_WINDOW_TYPE_HINT_MENU:
case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
case GDK_WINDOW_TYPE_HINT_TOOLBAR:
case GDK_WINDOW_TYPE_HINT_COMBO:
return rhs != GDK_WINDOW_TYPE_HINT_MENU &&
rhs != GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU &&
rhs != GDK_WINDOW_TYPE_HINT_POPUP_MENU &&
rhs != GDK_WINDOW_TYPE_HINT_TOOLBAR &&
rhs != GDK_WINDOW_TYPE_HINT_COMBO;
case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
case GDK_WINDOW_TYPE_HINT_UTILITY:
return rhs != GDK_WINDOW_TYPE_HINT_SPLASHSCREEN &&
rhs != GDK_WINDOW_TYPE_HINT_UTILITY;
case GDK_WINDOW_TYPE_HINT_DND:
case GDK_WINDOW_TYPE_HINT_TOOLTIP:
case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
return rhs != GDK_WINDOW_TYPE_HINT_DND &&
rhs != GDK_WINDOW_TYPE_HINT_TOOLTIP &&
rhs != GDK_WINDOW_TYPE_HINT_NOTIFICATION;
case GDK_WINDOW_TYPE_HINT_NORMAL:
case GDK_WINDOW_TYPE_HINT_DESKTOP:
default:
return rhs != GDK_WINDOW_TYPE_HINT_NORMAL &&
rhs != GDK_WINDOW_TYPE_HINT_DESKTOP;
}
}
static void
drop_cairo_surface (GdkWindow *window)
{
@ -1045,7 +1085,7 @@ gdk_mir_window_impl_set_type_hint (GdkWindow *window,
{
GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
if (hint != impl->type_hint)
if (type_hint_differs (hint, impl->type_hint))
{
impl->type_hint = hint;
if (impl->surface && !impl->pending_spec_update)