diff options
author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-11-14 23:18:53 +0100 |
---|---|---|
committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-11-14 23:19:15 +0100 |
commit | f5c5e9385e960a74ce38bc58a30fa36474d0cd6a (patch) | |
tree | d45206d2108a8476a64cc1bc48a860edd90f2e8a | |
parent | 8bc523ef5915d4ab7ced843929c8e3f1bf754016 (diff) | |
download | gtk+-f5c5e9385e960a74ce38bc58a30fa36474d0cd6a.tar.gz |
mir: handle more surface types
-rw-r--r-- | gdk/mir/gdkmirwindowimpl.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c index ec752e233f..f5cf957124 100644 --- a/gdk/mir/gdkmirwindowimpl.c +++ b/gdk/mir/gdkmirwindowimpl.c @@ -757,15 +757,17 @@ gdk_mir_window_impl_set_type_hint (GdkWindow *window, case GDK_WINDOW_TYPE_HINT_COMBO: mir_type = mir_surface_type_popover; break; - case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN: case GDK_WINDOW_TYPE_HINT_TOOLTIP: + mir_type = mir_surface_type_tip; + break; + case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN: case GDK_WINDOW_TYPE_HINT_DND: case GDK_WINDOW_TYPE_HINT_NOTIFICATION: mir_type = mir_surface_type_overlay; break; } - mir_surface_set_type (GDK_MIR_WINDOW_IMPL (window->impl), mir_type); + set_surface_type (GDK_MIR_WINDOW_IMPL (window->impl), mir_type); } static GdkWindowTypeHint @@ -778,15 +780,20 @@ gdk_mir_window_impl_get_type_hint (GdkWindow *window) case mir_surface_type_normal: case mir_surface_type_freestyle: case mir_surface_type_inputmethod: + case mir_surface_type_satellite: return GDK_WINDOW_TYPE_HINT_NORMAL; case mir_surface_type_utility: return GDK_WINDOW_TYPE_HINT_UTILITY; case mir_surface_type_dialog: return GDK_WINDOW_TYPE_HINT_DIALOG; - case mir_surface_type_overlay: + case mir_surface_type_tip: return GDK_WINDOW_TYPE_HINT_TOOLTIP; case mir_surface_type_popover: return GDK_WINDOW_TYPE_HINT_MENU; + case mir_surface_type_overlay: + return GDK_WINDOW_TYPE_HINT_NOTIFICATION; + case mir_surface_types: + break; } return GDK_WINDOW_TYPE_HINT_NORMAL; |