ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue #192 - flip the notebook page when hiding the dialog, forces the texture window to redraw correctly on next show

Browse source
This commit is contained in:
Timothee "TTimo" Besset 2013-07-06 16:48:47 -05:00
parent 1c1fa7173a
commit d7fde9f5da
5 changed files with 16 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
radiant/groupdialog.cpp
View file

@ -656,35 +656,36 @@ void SetInspectorMode( int iType ){
} }
} }
switch ( iType ) switch ( iType ) {
{
case W_ENTITY: case W_ENTITY:
// entity is always first in the inspector // entity is always first in the inspector
gtk_window_set_title( GTK_WINDOW( g_qeglobals_gui.d_entity ), "Entities" ); gtk_window_set_title( GTK_WINDOW( g_qeglobals_gui.d_entity ), "Entities" );
gtk_notebook_set_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 0 ); gtk_notebook_set_current_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 0 );
break; break;
case W_TEXTURE: case W_TEXTURE:
g_pParentWnd->GetTexWnd()->FocusEdit(); g_pParentWnd->GetTexWnd()->FocusEdit();
gtk_window_set_title( GTK_WINDOW( g_qeglobals_gui.d_entity ), "Textures" ); gtk_window_set_title( GTK_WINDOW( g_qeglobals_gui.d_entity ), "Textures" );
if ( g_pParentWnd->FloatingGroupDialog() ) { if ( g_pParentWnd->FloatingGroupDialog() ) {
gtk_notebook_set_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 1 ); // if the notebook page is already at 1, no expose event fires up on the embedded GLWindow, leading in the texture window not drawing
// I did witness an expose event on the notebook widget though, but for some reason it's not traveling down..
// so when hiding the group dialog, we are setting the page to 0, the page switch does an expose and triggers drawing.. (see OnDialogKey)
gtk_notebook_set_current_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 1 );
} }
break; break;
case W_CONSOLE: case W_CONSOLE:
gtk_window_set_title( GTK_WINDOW( g_qeglobals_gui.d_entity ), "Console" ); gtk_window_set_title( GTK_WINDOW( g_qeglobals_gui.d_entity ), "Console" );
if ( g_pParentWnd->FloatingGroupDialog() ) { if ( g_pParentWnd->FloatingGroupDialog() ) {
gtk_notebook_set_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 2 ); gtk_notebook_set_current_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 2 );
} }
break; break;
case W_GROUP: case W_GROUP:
if ( g_pParentWnd->FloatingGroupDialog() ) { if ( g_pParentWnd->FloatingGroupDialog() ) {
gtk_notebook_set_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 3 ); gtk_notebook_set_current_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 3 );
} } else {
else{ gtk_notebook_set_current_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 1 );
gtk_notebook_set_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 1 );
} }
break; break;
@ -1097,34 +1098,7 @@ static gint entityentry_keypress( GtkWidget* widget, GdkEventKey* event, gpointe
return FALSE; return FALSE;
} }
/*
// add a new group, put all selected brushes into the group
static void groupdlg_add (GtkWidget *widget, gpointer data)
{
char* name = DoNameDlg ("New Group");
if (name != NULL)
{
// create a new group node
GtkCTreeNode *item;
item = gtk_ctree_insert_node (GTK_CTREE (g_wndGroup.m_pTree), g_pGroupDlg->m_hWorld, NULL, &name, 0,
tree_pixmaps[IMG_GROUP], tree_masks[IMG_GROUP],
tree_pixmaps[IMG_GROUP], tree_masks[IMG_GROUP], FALSE, TRUE);
// create a new group
group_t *g = Group_Alloc (name);
g->itemOwner = item;
g->next = g_pGroups;
g_pGroups = g;
// now add the selected brushes
// NOTE: it would be much faster to give the group_t for adding
// but Select_AddToGroup is the standard way for all other cases
Select_AddToGroup (name);
g_free (name);
}
}
*/
static void switch_page( GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer data ){ static void switch_page( GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer data ){
char *text; char *text;
gtk_label_get( GTK_LABEL( gtk_notebook_get_tab_label( notebook, gtk_notebook_get_nth_page( notebook, page_num ) ) ), &text ); gtk_label_get( GTK_LABEL( gtk_notebook_get_tab_label( notebook, gtk_notebook_get_nth_page( notebook, page_num ) ) ), &text );
@ -1165,14 +1139,12 @@ static void switch_page( GtkNotebook *notebook, GtkNotebookPage *page, guint pag
// NOTE: when a key is hit with group window focused, we catch in this handler but it gets propagated to mainframe too // NOTE: when a key is hit with group window focused, we catch in this handler but it gets propagated to mainframe too
// therefore the message will be intercepted and used as a ID_SELECTION_DESELECT // therefore the message will be intercepted and used as a ID_SELECTION_DESELECT
static gint OnDialogKey( GtkWidget* widget, GdkEventKey* event, gpointer data ){ static gint OnDialogKey( GtkWidget* widget, GdkEventKey* event, gpointer data ){
#ifdef DBG_PI
Sys_Printf( "OnDialogKey\n" );
#endif
if ( ( event->keyval == GDK_Escape ) && ( g_pParentWnd->CurrentStyle() != MainFrame::eFloating ) ) { if ( ( event->keyval == GDK_Escape ) && ( g_pParentWnd->CurrentStyle() != MainFrame::eFloating ) ) {
// toggle off the group view (whatever part of it is currently displayed) // toggle off the group view (whatever part of it is currently displayed)
// this used to be done with a g_pParentWnd->OnViewEntity(); but it had bad consequences // this used to be done with a g_pParentWnd->OnViewEntity(); but it had bad consequences
// http://fenris.lokigames.com/show_bug.cgi?id=2773 gtk_widget_hide( widget );
widget_delete_hide( g_qeglobals_gui.d_entity ); // set the group notebook page back to 0, so that when we recall the texture view there is an expose event coming up
gtk_notebook_set_current_page( GTK_NOTEBOOK( g_pGroupDlg->m_pNotebook ), 0 );
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -1205,6 +1177,7 @@ void GroupDlg::Create(){
gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", GTK_SIGNAL_FUNC( widget_delete_hide ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", GTK_SIGNAL_FUNC( widget_delete_hide ), NULL );
// catch 'Esc' // catch 'Esc'
gtk_signal_connect( GTK_OBJECT( dlg ), "key_press_event", GTK_SIGNAL_FUNC( OnDialogKey ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "key_press_event", GTK_SIGNAL_FUNC( OnDialogKey ), NULL );
gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) ); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) );
g_qeglobals_gui.d_entity = dlg; g_qeglobals_gui.d_entity = dlg;
@ -1316,33 +1289,21 @@ void GroupDlg::Create(){
GtkWidget *check = gtk_check_button_new_with_label( _( "!Easy" ) ); GtkWidget *check = gtk_check_button_new_with_label( _( "!Easy" ) );
gtk_widget_show( check ); gtk_widget_show( check );
gtk_signal_connect( GTK_OBJECT( check ), "toggled", GTK_SIGNAL_FUNC( entity_check ), NULL ); gtk_signal_connect( GTK_OBJECT( check ), "toggled", GTK_SIGNAL_FUNC( entity_check ), NULL );
/* gtk_table_attach (GTK_TABLE (table), check, 2, 3, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);*/
EntWidgets[EntCheck17] = check; EntWidgets[EntCheck17] = check;
check = gtk_check_button_new_with_label( _( "!Medium" ) ); check = gtk_check_button_new_with_label( _( "!Medium" ) );
gtk_widget_show( check ); gtk_widget_show( check );
gtk_signal_connect( GTK_OBJECT( check ), "toggled", GTK_SIGNAL_FUNC( entity_check ), NULL ); gtk_signal_connect( GTK_OBJECT( check ), "toggled", GTK_SIGNAL_FUNC( entity_check ), NULL );
/* gtk_table_attach (GTK_TABLE (table), check, 2, 3, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);*/
EntWidgets[EntCheck18] = check; EntWidgets[EntCheck18] = check;
check = gtk_check_button_new_with_label( _( "!Hard" ) ); check = gtk_check_button_new_with_label( _( "!Hard" ) );
gtk_widget_show( check ); gtk_widget_show( check );
gtk_signal_connect( GTK_OBJECT( check ), "toggled", GTK_SIGNAL_FUNC( entity_check ), NULL ); gtk_signal_connect( GTK_OBJECT( check ), "toggled", GTK_SIGNAL_FUNC( entity_check ), NULL );
/* gtk_table_attach (GTK_TABLE (table), check, 2, 3, 2, 3,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);*/
EntWidgets[EntCheck19] = check; EntWidgets[EntCheck19] = check;
check = gtk_check_button_new_with_label( _( "!DeathMatch" ) ); check = gtk_check_button_new_with_label( _( "!DeathMatch" ) );
gtk_widget_show( check ); gtk_widget_show( check );
gtk_signal_connect( GTK_OBJECT( check ), "toggled", GTK_SIGNAL_FUNC( entity_check ), NULL ); gtk_signal_connect( GTK_OBJECT( check ), "toggled", GTK_SIGNAL_FUNC( entity_check ), NULL );
/* gtk_table_attach (GTK_TABLE (table), check, 2, 3, 3, 4,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);*/
EntWidgets[EntCheck20] = check; EntWidgets[EntCheck20] = check;
} }
} }
@ -1619,63 +1580,8 @@ void GroupDlg::Create(){
} }
} }
//++timo NOTE: this part for grouping code, don't remove! (we'll put it back in sometime soon)
/*
vbox = gtk_vbox_new (FALSE, 5);
gtk_widget_show (vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
scr = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (scr);
gtk_box_pack_start (GTK_BOX (vbox), scr, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scr), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
ctree = gtk_ctree_new (1, 0);
gtk_widget_show (ctree);
gtk_container_add (GTK_CONTAINER (scr), ctree);
gtk_clist_column_titles_hide (GTK_CLIST (ctree));
m_pTree = ctree;
hbox = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
button = gtk_button_new_with_label (_("Add..."));
gtk_widget_show (button);
gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (groupdlg_add), NULL);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 60, -2);
button = gtk_button_new_with_label (_("Edit..."));
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 60, -2);
button = gtk_button_new_with_label (_("Delete"));
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 60, -2);
label = gtk_label_new (_("Groups"));
gtk_widget_show (label);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
*/
inspector_mode = W_ENTITY; inspector_mode = W_ENTITY;
// gtk_window_set_title (GTK_WINDOW (dlg), _("Entities"));
m_pWidget = dlg; m_pWidget = dlg;
/*
load_pixmap ("grouptree1.bmp", g_pParentWnd->m_pWidget, &tree_pixmaps[0], &tree_masks[0]);
load_pixmap ("grouptree2.bmp", g_pParentWnd->m_pWidget, &tree_pixmaps[1], &tree_masks[1]);
load_pixmap ("grouptree3.bmp", g_pParentWnd->m_pWidget, &tree_pixmaps[2], &tree_masks[2]);
load_pixmap ("grouptree4.bmp", g_pParentWnd->m_pWidget, &tree_pixmaps[3], &tree_masks[3]);
load_pixmap ("grouptree5.bmp", g_pParentWnd->m_pWidget, &tree_pixmaps[4], &tree_masks[4]);
load_pixmap ("grouptree6.bmp", g_pParentWnd->m_pWidget, &tree_pixmaps[5], &tree_masks[5]);
load_pixmap ("grouptree7.bmp", g_pParentWnd->m_pWidget, &tree_pixmaps[6], &tree_masks[6]);
Group_Init();
*/
g_signal_connect( G_OBJECT( notebook ), "switch_page", G_CALLBACK( switch_page ), dlg ); g_signal_connect( G_OBJECT( notebook ), "switch_page", G_CALLBACK( switch_page ), dlg );
} }
} }

7
radiant/mainframe.cpp
View file

@ -2809,8 +2809,6 @@ void MainFrame::Create(){
} }
} }
// g_qeglobals_gui.d_edit = NULL;
{ {
m_pTexWnd = new TexWnd(); m_pTexWnd = new TexWnd();
GtkWidget* frame = create_framed_texwnd( m_pTexWnd ); GtkWidget* frame = create_framed_texwnd( m_pTexWnd );
@ -2823,7 +2821,6 @@ void MainFrame::Create(){
} }
m_pTexWnd->m_pParent = g_pGroupDlg->m_pWidget; m_pTexWnd->m_pParent = g_pGroupDlg->m_pWidget;
// gtk_widget_realize (m_pTexWnd->GetWidget ());
m_pZWnd = create_floating_zwnd( this ); m_pZWnd = create_floating_zwnd( this );
while ( gtk_events_pending() ) while ( gtk_events_pending() )
@ -2857,7 +2854,6 @@ void MainFrame::Create(){
g_pParentWnd->OnEntitiesSetViewAs( 0 ); g_pParentWnd->OnEntitiesSetViewAs( 0 );
// m_wndTextureBar.Create (vbox);
create_main_statusbar( window, vbox ); create_main_statusbar( window, vbox );
LoadCommandMap(); LoadCommandMap();
@ -2881,9 +2877,6 @@ void MainFrame::Create(){
gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM( item ), g_PrefsDlg.m_bTexturesShaderlistOnly ? TRUE : FALSE ); gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM( item ), g_PrefsDlg.m_bTexturesShaderlistOnly ? TRUE : FALSE );
g_bIgnoreCommands--; g_bIgnoreCommands--;
// if (g_PrefsDlg.m_bTextureBar)
// gtk_widget_show (m_wndTextureBar.m_pWidget);
SetActiveXY( m_pXYWnd ); SetActiveXY( m_pXYWnd );
s_idle_id = gtk_timeout_add( 25, mainframe_idle, this ); s_idle_id = gtk_timeout_add( 25, mainframe_idle, this );

9
radiant/patchdialog.cpp
View file

@ -75,9 +75,6 @@ static void OnSelchangeComboColRow( GtkWidget *widget, gpointer data ){
if ( !g_PatchDialog.m_bListenChanged ) { if ( !g_PatchDialog.m_bListenChanged ) {
return; return;
} }
#ifdef DBG_PI
Sys_Printf( "OnSelchangeComboColRow\n" );
#endif
// retrieve the current m_nRow and m_nCol, other params are not relevant // retrieve the current m_nRow and m_nCol, other params are not relevant
// (NOTE: UpdateData has a mechanism to avoid inifinite looping) // (NOTE: UpdateData has a mechanism to avoid inifinite looping)
g_PatchDialog.UpdateData( TRUE ); g_PatchDialog.UpdateData( TRUE );
@ -205,9 +202,6 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
adj->value = 0; adj->value = 0;
#ifdef DBG_PI
Sys_Printf( "Patch_SetTextureInfo: %g %g %g %g %g\n", td.shift[0], td.shift[1],td.scale[0],td.scale[1],td.rotate );
#endif
// will scale shift rotate the patch accordingly // will scale shift rotate the patch accordingly
Patch_SetTextureInfo( &td ); Patch_SetTextureInfo( &td );
// update the point-by-point view // update the point-by-point view
@ -216,9 +210,6 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
} }
static gint OnDialogKey( GtkWidget* widget, GdkEventKey* event, gpointer data ){ static gint OnDialogKey( GtkWidget* widget, GdkEventKey* event, gpointer data ){
#ifdef DBG_PI
Sys_Printf( "OnDialogKey\n" );
#endif
if ( event->keyval == GDK_Return ) { if ( event->keyval == GDK_Return ) {
OnApply( NULL, NULL ); OnApply( NULL, NULL );
return TRUE; return TRUE;

4
radiant/patchdialog.h
View file

@ -24,10 +24,6 @@
#include "dialog.h" #include "dialog.h"
#ifdef _DEBUG
//#define DBG_PI
#endif
class PatchDialog : public Dialog class PatchDialog : public Dialog
{ {
public: public: