From b03da2af60e109921967fd38a2ba16bfb4df9f5d Mon Sep 17 00:00:00 2001 From: fiaxh Date: Mon, 25 Nov 2019 23:23:06 +0100 Subject: Check window width and hight before (re)storing them --- libdino/src/entity/settings.vala | 56 ---------------------------------------- libdino/src/util.vala | 2 +- 2 files changed, 1 insertion(+), 57 deletions(-) (limited to 'libdino') diff --git a/libdino/src/entity/settings.vala b/libdino/src/entity/settings.vala index f94a92ca..ef25fd23 100644 --- a/libdino/src/entity/settings.vala +++ b/libdino/src/entity/settings.vala @@ -11,12 +11,6 @@ public class Settings : Object { send_marker_ = col_to_bool_or_default("send_marker", true); notifications_ = col_to_bool_or_default("notifications", true); convert_utf8_smileys_ = col_to_bool_or_default("convert_utf8_smileys", true); - - current_width = col_to_int_or_default("window_width", 1200); - current_height = col_to_int_or_default("window_height", 700); - is_maximized = col_to_bool_or_default("window_maximized", false); - position_x = col_to_int_or_default("window_position_x", -1); - position_y = col_to_int_or_default("window_position_y", -1); } private bool col_to_bool_or_default(string key, bool def) { @@ -64,56 +58,6 @@ public class Settings : Object { convert_utf8_smileys_ = value; } } - - private int current_width_; - public int current_width { - get { return current_width_; } - set { - if (value == current_width_) return; - db.settings.insert().or("REPLACE").value(db.settings.key, "window_width").value(db.settings.value, value.to_string()).perform(); - current_width_ = value; - } - } - - private int current_height_; - public int current_height { - get { return current_height_; } - set { - if (value == current_height_) return; - db.settings.insert().or("REPLACE").value(db.settings.key, "window_height").value(db.settings.value, value.to_string()).perform(); - current_height_ = value; - } - } - - private bool is_maximized_; - public bool is_maximized { - get { return is_maximized_; } - set { - if (value == is_maximized_) return; - db.settings.insert().or("REPLACE").value(db.settings.key, "window_maximized").value(db.settings.value, value.to_string()).perform(); - is_maximized_ = value; - } - } - - private int position_x_; - public int position_x { - get { return position_x_; } - set { - if (value == position_x_) return; - db.settings.insert().or("REPLACE").value(db.settings.key, "window_position_x").value(db.settings.value, value.to_string()).perform(); - position_x_ = value; - } - } - - private int position_y_; - public int position_y { - get { return position_y_; } - set { - if (value == position_y_) return; - db.settings.insert().or("REPLACE").value(db.settings.key, "window_position_y").value(db.settings.value, value.to_string()).perform(); - position_y_ = value; - } - } } } diff --git a/libdino/src/util.vala b/libdino/src/util.vala index cc705c10..c691a279 100644 --- a/libdino/src/util.vala +++ b/libdino/src/util.vala @@ -66,4 +66,4 @@ public static void internationalize(string gettext_package, string locales_dir) Intl.bindtextdomain(gettext_package, locales_dir); } -} \ No newline at end of file +} -- cgit v1.2.3-54-g00ecf