Browse Source

Imported Upstream version 3.2.1

tags/upstream/3.2.1^0
Margarita Manterola 4 years ago
parent
commit
641e35f701
2 changed files with 1 additions and 18 deletions
  1. +1
    -1
      configure.ac
  2. +0
    -17
      src/core/window.c

+ 1
- 1
configure.ac View File

@@ -2,7 +2,7 @@ AC_PREREQ(2.50)

m4_define([muffin_major_version], [3])
m4_define([muffin_minor_version], [2])
m4_define([muffin_micro_version], [0])
m4_define([muffin_micro_version], [1])

m4_define([muffin_version],
[muffin_major_version.muffin_minor_version.muffin_micro_version])


+ 0
- 17
src/core/window.c View File

@@ -8108,19 +8108,6 @@ 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)
{
@@ -8211,10 +8198,6 @@ recalc_window_type (MetaWindow *window)
{
/* Decorated types */
case META_WINDOW_NORMAL:
if (is_ime_popup (window)) {
window->type = META_WINDOW_POPUP_MENU;
break;
}
case META_WINDOW_DIALOG:
case META_WINDOW_MODAL_DIALOG:
case META_WINDOW_MENU:


Loading…
Cancel
Save