From 317a7bdbfbeeb995fdc649e3f5d569100a3af8d5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 31 Oct 2011 20:32:16 +0000 Subject: [PATCH] fixed default position/size behaviour --- src/cfg.c | 2 +- src/ui.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/cfg.c b/src/cfg.c index 3e66927..8b25c40 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -487,7 +487,7 @@ struct config *config_load() KEY_INTERFACE_WINDOW_DIVIDER_POS, NULL); - if (!c->window_w || !c->window_h) { + if (!c->window_restore_enabled || !c->window_w || !c->window_h) { c->window_w = 800; c->window_h = 200; } diff --git a/src/ui.c b/src/ui.c index 99fd494..504eeb5 100644 --- a/src/ui.c +++ b/src/ui.c @@ -225,14 +225,15 @@ void ui_window_create(struct ui_psensor *ui) struct config *cfg; cfg = ui->config; - if (cfg->window_restore_enabled) { - gtk_window_set_default_size(GTK_WINDOW(window), - cfg->window_w, - cfg->window_h); + if (cfg->window_restore_enabled) gtk_window_move(GTK_WINDOW(window), cfg->window_x, cfg->window_y); - } + + gtk_window_set_default_size(GTK_WINDOW(window), + cfg->window_w, + cfg->window_h); + gtk_window_set_title(GTK_WINDOW(window), _("Psensor - Temperature Monitor")); @@ -337,8 +338,9 @@ void ui_window_update(struct ui_psensor *ui) GTK_WIDGET(ui->w_graph), TRUE, TRUE); } - gtk_paned_set_position(GTK_PANED(ui->sensor_box), - ui->config->window_divider_pos); + if (cfg->window_restore_enabled) + gtk_paned_set_position(GTK_PANED(ui->sensor_box), + ui->config->window_divider_pos); if (!init) -- 2.7.4