isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

tiling: rename side-by-side tiling to edge tiling

Browse Source 
Currently, the new tiling feature, supports side-by-side, horizontal
tiling when dragging windows to one of the vertical edges of a monitor.

Other types of tiling (on other monitor edges) are potentially useful,
though.

This commit renames the preference from side_by_side_tiling to
edge_tiling.

https://bugzilla.gnome.org/show_bug.cgi?id=630548
This commit is contained in:
Ray Strode 2010-09-24 14:28:12 -04:00
parent 1986b20499
commit 0d27c9600f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/prefs.c
View File

@ -104,7 +104,7 @@ static char *cursor_theme = NULL;
static int cursor_size = 24; static int cursor_size = 24;
static gboolean compositing_manager = FALSE; static gboolean compositing_manager = FALSE;
static gboolean resize_with_right_button = FALSE; static gboolean resize_with_right_button = FALSE;
static gboolean side_by_side_tiling = FALSE; static gboolean edge_tiling = FALSE;
static gboolean force_fullscreen = TRUE; static gboolean force_fullscreen = TRUE;
static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH; static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH;
@ -423,9 +423,9 @@ static MetaBoolPreference preferences_bool[] =
&resize_with_right_button, &resize_with_right_button,
FALSE, FALSE,
}, },
{ "/apps/metacity/general/side_by_side_tiling", { "/apps/metacity/general/edge_tiling",
META_PREF_SIDE_BY_SIDE_TILING, META_PREF_EDGE_TILING,
&side_by_side_tiling, &edge_tiling,
FALSE, FALSE,
}, },
{ "/apps/mutter/general/live_hidden_windows", { "/apps/mutter/general/live_hidden_windows",
@ -2010,8 +2010,8 @@ meta_preference_to_string (MetaPreference pref)
case META_PREF_RESIZE_WITH_RIGHT_BUTTON: case META_PREF_RESIZE_WITH_RIGHT_BUTTON:
return "RESIZE_WITH_RIGHT_BUTTON"; return "RESIZE_WITH_RIGHT_BUTTON";
case META_PREF_SIDE_BY_SIDE_TILING: case META_PREF_EDGE_TILING:
return "SIDE_BY_SIDE_TILING"; return "EDGE_TILING";
case META_PREF_FORCE_FULLSCREEN: case META_PREF_FORCE_FULLSCREEN:
return "FORCE_FULLSCREEN"; return "FORCE_FULLSCREEN";
@ -2926,9 +2926,9 @@ meta_prefs_get_gnome_animations ()
} }
gboolean gboolean
meta_prefs_get_side_by_side_tiling () meta_prefs_get_edge_tiling ()
{ {
return side_by_side_tiling; return edge_tiling;
} }
MetaKeyBindingAction MetaKeyBindingAction

2
src/core/window.c
View File

@ -7799,7 +7799,7 @@ update_move (MetaWindow *window,
shake_threshold = meta_ui_get_drag_threshold (window->screen->ui) * shake_threshold = meta_ui_get_drag_threshold (window->screen->ui) *
DRAG_THRESHOLD_TO_SHAKE_THRESHOLD_FACTOR; DRAG_THRESHOLD_TO_SHAKE_THRESHOLD_FACTOR;
if (meta_prefs_get_side_by_side_tiling () && if (meta_prefs_get_edge_tiling () &&
meta_window_can_tile (window)) meta_window_can_tile (window))
{ {
const MetaMonitorInfo *monitor; const MetaMonitorInfo *monitor;

4
src/include/prefs.h
View File

@ -60,7 +60,7 @@ typedef enum
META_PREF_CURSOR_SIZE, META_PREF_CURSOR_SIZE,
META_PREF_COMPOSITING_MANAGER, META_PREF_COMPOSITING_MANAGER,
META_PREF_RESIZE_WITH_RIGHT_BUTTON, META_PREF_RESIZE_WITH_RIGHT_BUTTON,
META_PREF_SIDE_BY_SIDE_TILING, META_PREF_EDGE_TILING,
META_PREF_FORCE_FULLSCREEN, META_PREF_FORCE_FULLSCREEN,
META_PREF_CLUTTER_PLUGINS, META_PREF_CLUTTER_PLUGINS,
META_PREF_LIVE_HIDDEN_WINDOWS, META_PREF_LIVE_HIDDEN_WINDOWS,
@ -99,7 +99,7 @@ gboolean meta_prefs_get_auto_raise (void);
int meta_prefs_get_auto_raise_delay (void); int meta_prefs_get_auto_raise_delay (void);
gboolean meta_prefs_get_gnome_accessibility (void); gboolean meta_prefs_get_gnome_accessibility (void);
gboolean meta_prefs_get_gnome_animations (void); gboolean meta_prefs_get_gnome_animations (void);
gboolean meta_prefs_get_side_by_side_tiling (void); gboolean meta_prefs_get_edge_tiling (void);
const char* meta_prefs_get_command (int i); const char* meta_prefs_get_command (int i);