summaryrefslogtreecommitdiff
path: root/src/core/prefs.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-01-24 09:21:38 +0100
committerStefano Karapetsas <[email protected]>2014-01-24 09:21:38 +0100
commit6f4ee23657a8fbaed9cc89e56e08b543203fefd3 (patch)
tree0866b9f11b0c1561ab03853d2d6efd2cbcbe0aeb /src/core/prefs.c
parent534f563ef5647a5d6359078b3c0c8eaba1aec877 (diff)
parenta87157176ca6e01c8c4047999ee584f00b63c11e (diff)
downloadmarco-6f4ee23657a8fbaed9cc89e56e08b543203fefd3.tar.bz2
marco-6f4ee23657a8fbaed9cc89e56e08b543203fefd3.tar.xz
Merge branch '1.7.0-window-snapping'
Diffstat (limited to 'src/core/prefs.c')
-rw-r--r--src/core/prefs.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 116a9bb8..5f46b554 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -117,6 +117,7 @@ static gboolean compositing_fast_alt_tab = FALSE;
static gboolean resize_with_right_button = FALSE;
static gboolean center_new_windows = FALSE;
static gboolean force_fullscreen = TRUE;
+static gboolean side_by_side_tiling = FALSE;
static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH;
static MetaButtonLayout button_layout;
@@ -401,6 +402,12 @@ static MetaBoolPreference preferences_bool[] =
&center_new_windows,
FALSE,
},
+ { "side-by-side-tiling",
+ KEY_GENERAL_SCHEMA,
+ META_PREF_SIDE_BY_SIDE_TILING,
+ &side_by_side_tiling,
+ FALSE,
+ },
{ NULL, NULL, 0, NULL, FALSE },
};
@@ -1545,6 +1552,9 @@ meta_preference_to_string (MetaPreference pref)
case META_PREF_FORCE_FULLSCREEN:
return "FORCE_FULLSCREEN";
+
+ case META_PREF_SIDE_BY_SIDE_TILING:
+ return "SIDE_BY_SIDE_TILING";
}
return "(unknown)";
@@ -2202,6 +2212,12 @@ meta_prefs_get_center_new_windows (void)
return center_new_windows;
}
+gboolean
+meta_prefs_get_side_by_side_tiling ()
+{
+ return side_by_side_tiling;
+}
+
guint
meta_prefs_get_mouse_button_resize (void)
{