quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* brushexport plugin: hide window on closing = preserve settings

Browse Source
This commit is contained in:
Garux 2020-01-05 05:35:39 +03:00
parent f990b5ed44
commit 2656228b13
4 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/brushexport/callbacks.cpp
View File

@ -9,16 +9,9 @@
#include "support.h" #include "support.h"
#include "export.h" #include "export.h"
// stuff from interface.cpp
void DestroyWindow();
//! TODO hide window on close
namespace callbacks { namespace callbacks {
void OnDestroy( GtkWidget* w, gpointer data ){
DestroyWindow();
}
static std::string s_export_path; static std::string s_export_path;
void OnExportClicked( GtkButton* button, gpointer choose_path ){ void OnExportClicked( GtkButton* button, gpointer choose_path ){

1
contrib/brushexport/callbacks.h
View File

@ -3,7 +3,6 @@ typedef struct _GtkButton GtkButton;
namespace callbacks { namespace callbacks {
void OnDestroy( GtkWidget *, gpointer );
void OnExportClicked( GtkButton *, gpointer ); void OnExportClicked( GtkButton *, gpointer );
void OnAddMaterial( GtkButton *, gpointer ); void OnAddMaterial( GtkButton *, gpointer );
void OnRemoveMaterial( GtkButton *, gpointer ); void OnRemoveMaterial( GtkButton *, gpointer );

23
contrib/brushexport/interface.cpp
View File

@ -152,8 +152,8 @@ create_w_plugplug2( void ){
gtk_box_pack_end( GTK_BOX( vbox2 ), t_exportmaterials, FALSE, FALSE, 0 ); gtk_box_pack_end( GTK_BOX( vbox2 ), t_exportmaterials, FALSE, FALSE, 0 );
using namespace callbacks; using namespace callbacks;
g_signal_connect( G_OBJECT( w_plugplug2 ), "destroy", G_CALLBACK( OnDestroy ), NULL ); g_signal_connect( G_OBJECT( w_plugplug2 ), "delete_event", G_CALLBACK( gtk_widget_hide_on_delete ), NULL );
g_signal_connect_swapped( G_OBJECT( b_close ), "clicked", G_CALLBACK( OnDestroy ), NULL ); g_signal_connect_swapped( G_OBJECT( b_close ), "clicked", G_CALLBACK( gtk_widget_hide ), w_plugplug2 );
g_signal_connect( G_OBJECT( b_export ), "clicked", G_CALLBACK( OnExportClicked ), NULL ); g_signal_connect( G_OBJECT( b_export ), "clicked", G_CALLBACK( OnExportClicked ), NULL );
g_signal_connect( G_OBJECT( b_exportAs ), "clicked", G_CALLBACK( OnExportClicked ), gpointer( 1 ) ); g_signal_connect( G_OBJECT( b_exportAs ), "clicked", G_CALLBACK( OnExportClicked ), gpointer( 1 ) );
@ -187,24 +187,17 @@ create_w_plugplug2( void ){
GLADE_HOOKUP_OBJECT( w_plugplug2, t_objects, "t_objects" ); GLADE_HOOKUP_OBJECT( w_plugplug2, t_objects, "t_objects" );
GLADE_HOOKUP_OBJECT( w_plugplug2, t_weld, "t_weld" ); GLADE_HOOKUP_OBJECT( w_plugplug2, t_weld, "t_weld" );
gtk_widget_show_all( w_plugplug2 );
return w_plugplug2; return w_plugplug2;
} }
// global main window, is 0 when not created // global main window, is 0 when not created
GtkWidget* g_brushexp_window = 0; GtkWidget* g_brushexp_window = 0;
// spawn plugin window (and make sure it got destroyed first or never created) // spawn or unhide plugin window
void CreateWindow( void ){ void CreateWindow( void ){
ASSERT_NOTNULL( !g_brushexp_window ); if( !g_brushexp_window )
gtk_widget_show_all( g_brushexp_window = create_w_plugplug2() ); g_brushexp_window = create_w_plugplug2();
} gtk_widget_show( g_brushexp_window );
void DestroyWindow( void ){
ASSERT_NOTNULL( g_brushexp_window );
gtk_widget_destroy( g_brushexp_window );
g_brushexp_window = 0;
}
bool IsWindowOpen( void ){
return g_brushexp_window != 0;
} }

5
contrib/brushexport/plugin.cpp
View File

@ -45,8 +45,6 @@
#include "typesystem.h" #include "typesystem.h"
void CreateWindow( void ); void CreateWindow( void );
void DestroyWindow( void );
bool IsWindowOpen( void );
GtkWidget *g_pRadiantWnd = NULL; GtkWidget *g_pRadiantWnd = NULL;
@ -78,9 +76,6 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
eMB_ICONDEFAULT ); eMB_ICONDEFAULT );
} }
else if ( string_equal( command, "Export .obj" ) ) { else if ( string_equal( command, "Export .obj" ) ) {
if ( IsWindowOpen() ) {
DestroyWindow();
}
CreateWindow(); CreateWindow();
} }
} }