From ff2e303f8653c5ed1c458b73bda2ee19617e3628 Mon Sep 17 00:00:00 2001 From: Takamichi Horikawa Date: Thu, 24 Aug 2017 02:52:30 +0900 Subject: gtk: dialog behavior when already shown --- gtk/configdialog.c | 2 +- gtk/oscilloview-gl.c | 4 +++- gtk/oscilloview.c | 4 +++- gtk/toneview.c | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'gtk') 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)); } } -- cgit v1.2.3