X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=contrib%2Fprtview%2FConfigDialog.cpp;h=d030b55ee327bfcb05ad012c8c777c2b4cd6f1be;hb=HEAD;hp=3b3e80c05b8d1b4b52041ce984f1df9411ebf6f4;hpb=87f4eea939309a5ea1972323e237d23afdf01104;p=xonotic%2Fnetradiant.git diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp index 3b3e80c0..d030b55e 100644 --- a/contrib/prtview/ConfigDialog.cpp +++ b/contrib/prtview/ConfigDialog.cpp @@ -21,6 +21,7 @@ #include #include #include +#include "gtkutil/dialog.h" #include "gtkutil/pointer.h" #include "iscenegraph.h" @@ -39,7 +40,7 @@ static void dialog_button_callback( ui::Widget widget, gpointer data ){ *ret = gpointer_to_int( data ); } -static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){ +static gint custom_dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){ widget.hide(); int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop"); *loop = 0; @@ -58,7 +59,6 @@ static int DoColor( PackedColour *c ){ clr.green = (guint16) (GetBValue(*c) * (65535 / 255)); auto dlg = ui::Widget::from(gtk_color_selection_dialog_new( "Choose Color" )); - gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pRadiantWnd ) ); gtk_window_set_position( GTK_WINDOW( dlg ),GTK_WIN_POS_CENTER_ON_PARENT ); gtk_window_set_modal( GTK_WINDOW( dlg ), TRUE ); @@ -237,15 +237,11 @@ static void OnClip(ui::Widget widget, gpointer data ){ SceneChangeNotify(); } -void DoConfigDialog(){ +void DoConfigDialog( ui::Window main_window ){ int loop = 1, ret = IDCANCEL; + ModalDialog dialog; auto dlg = ui::Window( ui::window_type::TOP ); - - gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pRadiantWnd ) ); - gtk_window_set_position( GTK_WINDOW( dlg ),GTK_WIN_POS_CENTER_ON_PARENT ); - gtk_window_set_modal( GTK_WINDOW( dlg ), TRUE ); - gtk_window_set_title( dlg, "Portal Viewer Configuration" ); dlg.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );