isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-17 05:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a META_MAXIMIZE_BOTH

Browse Source 
Which has the value of META_MAXIMIZE_VERTICAL |
META_MAXIMIZE_HORIZONTAL.

This is an obvious code cleanup.
This commit is contained in:
Jasper St. Pierre 2014-03-13 18:32:20 -04:00
parent d294fa45d1
commit 7116786ad3
6 changed files with 31 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compositor/meta-window-actor.c
View File

@ -714,7 +714,7 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
/* Leaving out shadows for maximized and fullscreen windows is an effeciency /* Leaving out shadows for maximized and fullscreen windows is an effeciency
* win and also prevents the unsightly effect of the shadow of maximized * win and also prevents the unsightly effect of the shadow of maximized
* window appearing on an adjacent window */ * window appearing on an adjacent window */
if ((meta_window_get_maximized (priv->window) == (META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL)) || if ((meta_window_get_maximized (priv->window) == META_MAXIMIZE_BOTH) ||
meta_window_is_fullscreen (priv->window)) meta_window_is_fullscreen (priv->window))
return FALSE; return FALSE;

24
src/core/core.c
View File

@ -328,8 +328,7 @@ meta_core_maximize (Display *xdisplay,
if (meta_prefs_get_raise_on_click ()) if (meta_prefs_get_raise_on_click ())
meta_window_raise (window); meta_window_raise (window);
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
} }
void void
@ -342,11 +341,9 @@ meta_core_toggle_maximize_vertically (Display *xdisplay,
meta_window_raise (window); meta_window_raise (window);
if (META_WINDOW_MAXIMIZED_VERTICALLY (window)) if (META_WINDOW_MAXIMIZED_VERTICALLY (window))
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_VERTICAL);
META_MAXIMIZE_VERTICAL);
else else
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_VERTICAL);
META_MAXIMIZE_VERTICAL);
} }
void void
@ -359,11 +356,9 @@ meta_core_toggle_maximize_horizontally (Display *xdisplay,
meta_window_raise (window); meta_window_raise (window);
if (META_WINDOW_MAXIMIZED_HORIZONTALLY (window)) if (META_WINDOW_MAXIMIZED_HORIZONTALLY (window))
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_HORIZONTAL);
META_MAXIMIZE_HORIZONTAL);
else else
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_HORIZONTAL);
META_MAXIMIZE_HORIZONTAL);
} }
void void
@ -376,11 +371,9 @@ meta_core_toggle_maximize (Display *xdisplay,
meta_window_raise (window); meta_window_raise (window);
if (META_WINDOW_MAXIMIZED (window)) if (META_WINDOW_MAXIMIZED (window))
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
else else
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
} }
void void
@ -392,8 +385,7 @@ meta_core_unmaximize (Display *xdisplay,
if (meta_prefs_get_raise_on_click ()) if (meta_prefs_get_raise_on_click ())
meta_window_raise (window); meta_window_raise (window);
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL);
} }
void void

30
src/core/keybindings.c
View File

@ -1975,9 +1975,7 @@ process_mouse_move_resize_grab (MetaDisplay *display,
* moveresize now to get the position back to the original. * moveresize now to get the position back to the original.
*/ */
if (window->shaken_loose || window->tile_mode == META_TILE_MAXIMIZED) if (window->shaken_loose || window->tile_mode == META_TILE_MAXIMIZED)
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
else if (window->tile_mode != META_TILE_NONE) else if (window->tile_mode != META_TILE_NONE)
meta_window_tile (window); meta_window_tile (window);
else else
@ -2038,9 +2036,7 @@ process_keyboard_move_grab (MetaDisplay *display,
* now to get the position back to the original. * now to get the position back to the original.
*/ */
if (window->shaken_loose) if (window->shaken_loose)
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
else else
meta_window_move_resize (display->grab_window, meta_window_move_resize (display->grab_window,
TRUE, TRUE,
@ -2901,11 +2897,9 @@ handle_toggle_tiled (MetaDisplay *display,
: META_TILE_NONE; : META_TILE_NONE;
if (window->saved_maximize) if (window->saved_maximize)
meta_window_maximize (window, META_MAXIMIZE_VERTICAL | meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL);
else else
meta_window_unmaximize (window, META_MAXIMIZE_VERTICAL | meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL);
} }
else if (meta_window_can_tile_side_by_side (window)) else if (meta_window_can_tile_side_by_side (window))
{ {
@ -2931,13 +2925,9 @@ handle_toggle_maximized (MetaDisplay *display,
gpointer dummy) gpointer dummy)
{ {
if (META_WINDOW_MAXIMIZED (window)) if (META_WINDOW_MAXIMIZED (window))
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
else if (window->has_maximize_func) else if (window->has_maximize_func)
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
} }
static void static void
@ -2949,9 +2939,7 @@ handle_maximize (MetaDisplay *display,
gpointer dummy) gpointer dummy)
{ {
if (window->has_maximize_func) if (window->has_maximize_func)
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
} }
static void static void
@ -2963,9 +2951,7 @@ handle_unmaximize (MetaDisplay *display,
gpointer dummy) gpointer dummy)
{ {
if (window->maximized_vertically || window->maximized_horizontally) if (window->maximized_vertically || window->maximized_horizontally)
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
} }
static void static void

28
src/core/window.c
View File

@ -1368,9 +1368,7 @@ meta_window_apply_session_info (MetaWindow *window,
if (window->has_maximize_func && info->maximized) if (window->has_maximize_func && info->maximized)
{ {
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
if (info->saved_rect_set) if (info->saved_rect_set)
{ {
@ -3370,7 +3368,7 @@ meta_window_tile (MetaWindow *window)
return; return;
if (window->tile_mode == META_TILE_MAXIMIZED) if (window->tile_mode == META_TILE_MAXIMIZED)
directions = META_MAXIMIZE_VERTICAL | META_MAXIMIZE_HORIZONTAL; directions = META_MAXIMIZE_BOTH;
else else
directions = META_MAXIMIZE_VERTICAL; directions = META_MAXIMIZE_VERTICAL;
@ -7456,15 +7454,11 @@ menu_callback (MetaWindowMenu *menu,
break; break;
case META_MENU_OP_UNMAXIMIZE: case META_MENU_OP_UNMAXIMIZE:
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
break; break;
case META_MENU_OP_MAXIMIZE: case META_MENU_OP_MAXIMIZE:
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
break; break;
case META_MENU_OP_UNSHADE: case META_MENU_OP_UNSHADE:
@ -7981,10 +7975,7 @@ update_move (MetaWindow *window,
display->grab_anchor_root_x = x; display->grab_anchor_root_x = x;
display->grab_anchor_root_y = y; display->grab_anchor_root_y = y;
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
return; return;
} }
@ -8028,9 +8019,7 @@ update_move (MetaWindow *window,
window->user_rect.x = window->saved_rect.x; window->user_rect.x = window->saved_rect.x;
window->user_rect.y = window->saved_rect.y; window->user_rect.y = window->saved_rect.y;
meta_window_unmaximize (window, meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
} }
display->grab_initial_window_pos = work_area; display->grab_initial_window_pos = work_area;
@ -8038,10 +8027,7 @@ update_move (MetaWindow *window,
display->grab_anchor_root_y = y; display->grab_anchor_root_y = y;
window->shaken_loose = FALSE; window->shaken_loose = FALSE;
meta_window_maximize (window, meta_window_maximize (window, META_MAXIMIZE_BOTH);
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
return; return;
} }
} }

4
src/meta/window.h
View File

@ -72,11 +72,13 @@ typedef enum
* MetaMaximizeFlags: * MetaMaximizeFlags:
* @META_MAXIMIZE_HORIZONTAL: Horizontal * @META_MAXIMIZE_HORIZONTAL: Horizontal
* @META_MAXIMIZE_VERTICAL: Vertical * @META_MAXIMIZE_VERTICAL: Vertical
* @META_MAXIMIZE_BOTH: Both
*/ */
typedef enum typedef enum
{ {
META_MAXIMIZE_HORIZONTAL = 1 << 0, META_MAXIMIZE_HORIZONTAL = 1 << 0,
META_MAXIMIZE_VERTICAL = 1 << 1 META_MAXIMIZE_VERTICAL = 1 << 1,
META_MAXIMIZE_BOTH = (1 << 0 | 1 << 1),
} MetaMaximizeFlags; } MetaMaximizeFlags;
/** /**

8
src/wayland/meta-wayland-surface.c
View File

@ -883,9 +883,9 @@ xdg_surface_request_change_state (struct wl_client *client,
{ {
case XDG_SURFACE_STATE_MAXIMIZED: case XDG_SURFACE_STATE_MAXIMIZED:
if (value) if (value)
meta_window_maximize (surface->window, META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL); meta_window_maximize (surface->window, META_MAXIMIZE_BOTH);
else else
meta_window_unmaximize (surface->window, META_MAXIMIZE_HORIZONTAL | META_MAXIMIZE_VERTICAL); meta_window_unmaximize (surface->window, META_MAXIMIZE_BOTH);
break; break;
case XDG_SURFACE_STATE_FULLSCREEN: case XDG_SURFACE_STATE_FULLSCREEN:
if (value) if (value)
@ -1180,9 +1180,9 @@ wl_shell_surface_set_state (MetaWaylandSurface *surface,
meta_window_unmake_fullscreen (surface->window); meta_window_unmake_fullscreen (surface->window);
if (state == SURFACE_STATE_MAXIMIZED) if (state == SURFACE_STATE_MAXIMIZED)
meta_window_maximize (surface->window, META_MAXIMIZE_VERTICAL | META_MAXIMIZE_HORIZONTAL); meta_window_maximize (surface->window, META_MAXIMIZE_BOTH);
else else
meta_window_unmaximize (surface->window, META_MAXIMIZE_VERTICAL | META_MAXIMIZE_HORIZONTAL); meta_window_unmaximize (surface->window, META_MAXIMIZE_BOTH);
} }
static void static void