projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always restore the position of the window when it appears on the desktop
[psensor.git]
/
src
/
ui.c
diff --git
a/src/ui.c
b/src/ui.c
index
041e8d8
..
c503800
100644
(file)
--- 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;
{
struct ui_psensor *ui = data;
- save_window_pos(ui);
-
log_debug("is_status_supported: %d\n", is_status_supported());
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);
gtk_widget_hide(ui->main_window);
- else
+ } else {
ui_psensor_quit(ui);
ui_psensor_quit(ui);
+ }
return TRUE;
}
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);
window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
gtk_builder_connect_signals(builder, ui);
+
cfg = ui->config;
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);
config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui);
@@
-417,8
+414,18
@@
void ui_window_update(struct ui_psensor *ui)
void ui_window_show(struct ui_psensor *ui)
{
void ui_window_show(struct ui_psensor *ui)
{
+ struct config *cfg;
+
log_debug("ui_window_show()");
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);
ui_window_update(ui);
+
gtk_window_present(GTK_WINDOW(ui->main_window));
}
gtk_window_present(GTK_WINDOW(ui->main_window));
}