Browse Source

Imported Upstream version 2.2.3

upstream upstream/2.2.3
Maximiliano Curia 9 years ago
parent
commit
f36b630595
  1. 2
      configure.ac
  2. 2
      src/compositor/compositor.c
  3. 3
      src/compositor/meta-shaped-texture.c
  4. 9
      src/compositor/meta-texture-rectangle.c
  5. 3
      src/compositor/meta-texture-rectangle.h
  6. 2
      src/compositor/meta-texture-tower.c
  7. 21
      src/core/window.c
  8. 2
      src/org.cinnamon.muffin.gschema.xml.in
  9. 4
      src/ui/theme-parser.c
  10. 34
      src/ui/theme.c

2
configure.ac

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

2
src/compositor/compositor.c

@ -140,7 +140,7 @@ process_property_notify (MetaCompositor *compositor,
/* Check for the opacity changing */
if (event->atom == compositor->atom_net_wm_window_opacity)
{g_printerr ("REMOVE ME OPACITY ON COMPOSITOR\n");
{
meta_window_actor_update_opacity (window_actor);
DEBUG_TRACE ("process_property_notify: net_wm_window_opacity\n");
return;

3
src/compositor/meta-shaped-texture.c

@ -297,8 +297,7 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
COGL_PIXEL_FORMAT_A_8,
COGL_PIXEL_FORMAT_A_8,
stride,
mask_data,
NULL /* error */);
mask_data);
else
priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
COGL_TEXTURE_NONE,

9
src/compositor/meta-texture-rectangle.c

@ -37,8 +37,7 @@ meta_texture_rectangle_new (unsigned int width,
CoglPixelFormat format,
CoglPixelFormat internal_format,
unsigned int rowstride,
const guint8 *data,
GError **error)
const guint8 *data)
{
ClutterBackend *backend =
clutter_get_default_backend ();
@ -46,10 +45,14 @@ meta_texture_rectangle_new (unsigned int width,
clutter_backend_get_cogl_context (backend);
CoglTextureRectangle *tex_rect;
#if COGL_VERSION_CHECK (1, 17, 2)
tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
#else
tex_rect = cogl_texture_rectangle_new_with_size (context,
width, height,
internal_format,
error);
NULL);
#endif
if (tex_rect == NULL)
return NULL;

3
src/compositor/meta-texture-rectangle.h

@ -36,8 +36,7 @@ meta_texture_rectangle_new (unsigned int width,
CoglPixelFormat format,
CoglPixelFormat internal_format,
unsigned int rowstride,
const guint8 *data,
GError **error);
const guint8 *data );
gboolean
meta_texture_rectangle_check (CoglTexture *texture);

2
src/compositor/meta-texture-tower.c

@ -370,8 +370,6 @@ texture_tower_create_texture (MetaTextureTower *tower,
/* rowstride */
width * 4,
/* data */
NULL,
/* error */
NULL);
}
else

21
src/core/window.c

@ -4416,23 +4416,13 @@ window_activate (MetaWindow *window,
MetaClientType source_indication,
MetaWorkspace *workspace)
{
gboolean can_ignore_outdated_timestamps;
meta_topic (META_DEBUG_FOCUS,
"_NET_ACTIVE_WINDOW message sent for %s at time %u "
"by client type %u.\n",
window->desc, timestamp, source_indication);
/* Older EWMH spec didn't specify a timestamp; we decide to honor these only
* if the app specifies that it is a pager.
*
* Update: Unconditionally honor 0 timestamps for now; we'll fight
* that battle later. Just remove the "FALSE &&" in order to only
* honor 0 timestamps for pagers.
*/
can_ignore_outdated_timestamps =
(timestamp != 0 || (FALSE && source_indication != META_CLIENT_TYPE_PAGER));
if (XSERVER_TIME_IS_BEFORE (timestamp, window->display->last_user_time) &&
can_ignore_outdated_timestamps)
if (timestamp != 0 &&
XSERVER_TIME_IS_BEFORE (timestamp, window->display->last_user_time))
{
meta_topic (META_DEBUG_FOCUS,
"last_user_time (%u) is more recent; ignoring "
@ -4442,13 +4432,8 @@ window_activate (MetaWindow *window,
return;
}
/* For those stupid pagers, get a valid timestamp and show a warning */
if (timestamp == 0)
{
meta_warning ("meta_window_activate called by a pager with a 0 timestamp; "
"the pager needs to be fixed.\n");
timestamp = meta_display_get_current_time_roundtrip (window->display);
}
timestamp = meta_display_get_current_time_roundtrip (window->display);
meta_window_set_user_time (window, timestamp);

2
src/org.cinnamon.muffin.gschema.xml.in

@ -337,7 +337,7 @@
<_summary>Reverse switch system controls directly</_summary>
</key>
<key name="show-desktop" type="as">
<default>[]</default>
<default><![CDATA[['<Super>D']]]></default>
<_summary>Hide all normal windows</_summary>
</key>
<key name="panel-main-menu" type="as">

4
src/ui/theme-parser.c

@ -2213,10 +2213,8 @@ parse_draw_op_element (GMarkupParseContext *context,
/* Check last so we don't have to free it when other
* stuff fails.
*
* If it's a theme image, ask for it at 64px, which is
* the largest possible. We scale it anyway.
*/
pixbuf = meta_theme_load_image (info->theme, filename, 64, error);
pixbuf = meta_theme_load_image (info->theme, filename, info->theme->scale, error);
if (pixbuf == NULL)
{

34
src/ui/theme.c

@ -5330,7 +5330,7 @@ meta_theme_validate (MetaTheme *theme,
LOCAL_SYMBOL GdkPixbuf*
meta_theme_load_image (MetaTheme *theme,
const char *filename,
guint size_of_theme_icons,
guint scale,
GError **error)
{
GdkPixbuf *pixbuf;
@ -5344,12 +5344,12 @@ meta_theme_load_image (MetaTheme *theme,
if (g_str_has_prefix (filename, "theme:") &&
META_THEME_ALLOWS (theme, META_THEME_IMAGES_FROM_ICON_THEMES))
{
pixbuf = gtk_icon_theme_load_icon (
gtk_icon_theme_get_default (),
filename+6,
size_of_theme_icons,
0,
error);
pixbuf = gtk_icon_theme_load_icon_for_scale (gtk_icon_theme_get_default (),
filename+6,
20,
scale,
0,
error);
if (pixbuf == NULL) return NULL;
}
else
@ -5357,7 +5357,19 @@ meta_theme_load_image (MetaTheme *theme,
char *full_path;
full_path = g_build_filename (theme->dirname, filename, NULL);
pixbuf = gdk_pixbuf_new_from_file (full_path, error);
GdkPixbuf *test_pixbuf = NULL;
gint test_height, test_width;
test_pixbuf = gdk_pixbuf_new_from_file (full_path, error);
test_height = gdk_pixbuf_get_height (test_pixbuf);
test_width = gdk_pixbuf_get_width (test_pixbuf);
g_object_unref (test_pixbuf);
test_height *= scale;
test_width *= scale;
pixbuf = gdk_pixbuf_new_from_file_at_size (full_path, test_width, test_height, error);
if (pixbuf == NULL)
{
g_free (full_path);
@ -6446,6 +6458,12 @@ meta_gtk_state_to_string (GtkStateFlags state)
return "DIR_LTR";
case GTK_STATE_FLAG_DIR_RTL:
return "DIR_RTL";
#endif
#if GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 12)
case GTK_STATE_FLAG_LINK:
return "LINK";
case GTK_STATE_FLAG_VISITED:
return "VISITED";
#endif
}

Loading…
Cancel
Save