aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakamichi Horikawa <takamichiho@gmail.com>2017-08-24 02:52:30 +0900
committerTakamichi Horikawa <takamichiho@gmail.com>2017-08-24 02:52:30 +0900
commitff2e303f8653c5ed1c458b73bda2ee19617e3628 (patch)
treec6af4ec29dd55d0c2fd2aa458a6e893685e566dd
parentad839eb8338e8b84342bf36480fbf0a7a04fa2bd (diff)
gtk: dialog behavior when already shown
-rw-r--r--gtk/configdialog.c2
-rw-r--r--gtk/oscilloview-gl.c4
-rw-r--r--gtk/oscilloview.c4
-rw-r--r--gtk/toneview.c2
4 files changed, 9 insertions, 3 deletions
diff --git a/gtk/configdialog.c b/gtk/configdialog.c
index 350633f..94b5ee5 100644
--- a/gtk/configdialog.c
+++ b/gtk/configdialog.c
@@ -152,6 +152,6 @@ void show_configdialog(config_update_func *func, void *ptr) {
}
gtk_widget_show_all(g.configwin);
} else {
-
+ gtk_window_present(GTK_WINDOW(g.configwin));
}
}
diff --git a/gtk/oscilloview-gl.c b/gtk/oscilloview-gl.c
index b67bdce..40d6813 100644
--- a/gtk/oscilloview-gl.c
+++ b/gtk/oscilloview-gl.c
@@ -165,6 +165,8 @@ void show_oscilloview(void) {
g_signal_connect(glarea, "realize", G_CALLBACK(on_realize), 0);
gtk_container_add(GTK_CONTAINER(g.win), glarea);
gtk_widget_add_tick_callback(glarea, tick_cb, 0, 0);
+ gtk_widget_show_all(g.win);
+ } else {
+ gtk_window_present(GTK_WINDOW(g.win));
}
- gtk_widget_show_all(g.win);
}
diff --git a/gtk/oscilloview.c b/gtk/oscilloview.c
index e2893c6..0219766 100644
--- a/gtk/oscilloview.c
+++ b/gtk/oscilloview.c
@@ -77,6 +77,8 @@ void show_oscilloview(void) {
gtk_container_add(GTK_CONTAINER(g.win), drawarea);
g_signal_connect(drawarea, "draw", G_CALLBACK(draw_cb), 0);
gtk_widget_add_tick_callback(drawarea, tick_cb, 0, 0);
+ gtk_widget_show_all(g.win);
+ } else {
+ gtk_window_present(GTK_WINDOW(g.win));
}
- gtk_widget_show_all(g.win);
}
diff --git a/gtk/toneview.c b/gtk/toneview.c
index 64c4e98..99117d5 100644
--- a/gtk/toneview.c
+++ b/gtk/toneview.c
@@ -122,5 +122,7 @@ void show_toneview(void) {
}
gtk_widget_add_tick_callback(g.tonewin, tick_cb, 0, 0);
gtk_widget_show_all(g.tonewin);
+ } else {
+ gtk_window_present(GTK_WINDOW(g.tonewin));
}
}