Browse Source

Imported Upstream version 3.0.5

tags/upstream/3.0.5^0
Maximiliano Curia 5 years ago
parent
commit
ef7a938f66
4 changed files with 16 additions and 3 deletions
  1. +1
    -1
      configure.ac
  2. +2
    -2
      src/compositor/cogl-utils.c
  3. +8
    -0
      src/core/keybindings.c
  4. +5
    -0
      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], [0])
m4_define([muffin_micro_version], [4])
m4_define([muffin_micro_version], [5])

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


+ 2
- 2
src/compositor/cogl-utils.c View File

@@ -147,8 +147,8 @@ clamp_sizes (gint *width,
screen_height = gdk_screen_get_height (screen);
}

*width = MIN (*width, screen_width);
*height = MIN (*height, screen_height);
*width = MIN (*width, screen_width * 2);
*height = MIN (*height, screen_height * 2);
}

/**


+ 8
- 0
src/core/keybindings.c View File

@@ -38,6 +38,7 @@
#include "keybindings-private.h"
#include "workspace-private.h"
#include <meta/errors.h>
#include "window-private.h"
#include "edge-resistance.h"
#include "ui.h"
#include "frame.h"
@@ -2456,6 +2457,13 @@ handle_move_to (MetaDisplay *display,
new_y = outer.y;
}

if (window->has_custom_frame_extents)
{
const GtkBorder *extents = &window->custom_frame_extents;
new_x -= extents->left;
new_y -= extents->top;
}

meta_window_move_frame (window,
TRUE,
new_x,


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

@@ -4760,6 +4760,11 @@ meta_window_updates_are_frozen (MetaWindow *window)

if (window->sync_request_serial < window->sync_request_wait_serial)
return TRUE;

if (window->type == META_WINDOW_TOOLTIP &&
window->rect.x == 0 &&
window->rect.y == 0)
return TRUE;
#endif

return FALSE;


Loading…
Cancel
Save