Browse Source

Imported Upstream version 1.8.2

upstream upstream/1.8.2
Nicolas Bourdaud 9 years ago
parent
commit
a1098d2af2
  1. 2
      configure.in
  2. 6
      debian/changelog
  3. 4
      src/compositor/meta-window-actor.c
  4. 19
      src/core/window.c

2
configure.in

@ -2,7 +2,7 @@ AC_PREREQ(2.50)
m4_define([muffin_major_version], [1])
m4_define([muffin_minor_version], [8])
m4_define([muffin_micro_version], [1])
m4_define([muffin_micro_version], [2])
m4_define([muffin_version],
[muffin_major_version.muffin_minor_version.muffin_micro_version])

6
debian/changelog

@ -1,3 +1,9 @@
muffin (1.8.2) olivia; urgency=low
* 1.8.2
-- Clement Lefebvre <root@linuxmint.com> Sun, 19 May 2013 20:55:33 +0100
muffin (1.8.1) olivia; urgency=low
* 1.8.1

4
src/compositor/meta-window-actor.c

@ -1513,9 +1513,7 @@ meta_window_actor_new (MetaWindow *window)
if (window->type == META_WINDOW_DROPDOWN_MENU ||
window->type == META_WINDOW_POPUP_MENU ||
window->type == META_WINDOW_COMBO ||
window->type == META_WINDOW_NOTIFICATION ||
window->type == META_WINDOW_OVERRIDE_OTHER){
window->type == META_WINDOW_COMBO) {
clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group),
CLUTTER_ACTOR (self));
}

19
src/core/window.c

@ -7645,6 +7645,19 @@ meta_window_update_struts (MetaWindow *window)
}
}
static gboolean
is_ime_popup (MetaWindow *window)
{
const gchar *icon = window->icon_name;
const gchar *wc_name = meta_window_get_wm_class (window);
gboolean is_target_name = g_strcmp0 (wc_name, "Main.py") == 0 ||
g_strcmp0 (wc_name, "Ibus-ui-gtk3") == 0;
gboolean deco = meta_window_get_frame (window) != NULL;
return !deco && (icon == NULL) && is_target_name;
}
LOCAL_SYMBOL void
meta_window_recalc_window_type (MetaWindow *window)
{
@ -7735,6 +7748,12 @@ recalc_window_type (MetaWindow *window)
{
/* Decorated types */
case META_WINDOW_NORMAL:
if (is_ime_popup (window)) {
window->type = META_WINDOW_POPUP_MENU;
}
else
window->type = META_WINDOW_OVERRIDE_OTHER;
break;
case META_WINDOW_DIALOG:
case META_WINDOW_MODAL_DIALOG:
case META_WINDOW_MENU:

Loading…
Cancel
Save