X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=c503800dc0154f45931bac23c50124463966ac2f;hb=90ec04c6efb1f0b9e3887a86b1da9e7d0d33f16f;hp=02c620609b4e3cd47624a3db69e6b2d3c3c3fc1c;hpb=b6eb43c323307f4e1c8e5ef818d3cfe816557ee6;p=psensor.git diff --git a/src/ui.c b/src/ui.c index 02c6206..c503800 100644 --- a/src/ui.c +++ b/src/ui.c @@ -188,14 +188,14 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) { struct ui_psensor *ui = data; - save_window_pos(ui); - log_debug("is_status_supported: %d\n", is_status_supported()); - if (is_appindicator_supported() || is_status_supported()) + if (is_appindicator_supported() || is_status_supported()) { + save_window_pos(ui); gtk_widget_hide(ui->main_window); - else + } else { ui_psensor_quit(ui); + } return TRUE; } @@ -343,11 +343,8 @@ void ui_window_create(struct ui_psensor *ui) window = GTK_WIDGET(gtk_builder_get_object(builder, "window")); gtk_builder_connect_signals(builder, ui); + cfg = ui->config; - if (cfg->window_restore_enabled) - gtk_window_move(GTK_WINDOW(window), - cfg->window_x, - cfg->window_y); config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui); @@ -404,7 +401,6 @@ void ui_window_create(struct ui_psensor *ui) void ui_window_update(struct ui_psensor *ui) { struct config *cfg; - enum sensorlist_position sensorlist_pos; log_debug("ui_window_update()"); @@ -418,8 +414,18 @@ void ui_window_update(struct ui_psensor *ui) void ui_window_show(struct ui_psensor *ui) { + struct config *cfg; + log_debug("ui_window_show()"); + + cfg = ui->config; + if (cfg->window_restore_enabled) + gtk_window_move(GTK_WINDOW(ui->main_window), + cfg->window_x, + cfg->window_y); + ui_window_update(ui); + gtk_window_present(GTK_WINDOW(ui->main_window)); }