binds...
	* tex bro: left double click loads directory, containing active shader + focuses on it
		right double click loads 'common' directory
misc...
	* shader editor gets focus after been hidden behind main window and called again
	* patch thicken: significantly more fail safe; correct handling of cycled patches
	* fix: was parsing vfs twice; pk3s were being opened twice during runtime
	* fix: shortcuts work after startup (plugins bar buttons were stealing focus)
This commit is contained in:
Garux
2017-08-01 14:07:22 +03:00
parent 86023af46c
commit f6b9708d07
5 changed files with 158 additions and 55 deletions

View File

@@ -1423,8 +1423,9 @@ gboolean TextureBrowser_button_press( GtkWidget* widget, GdkEventButton* event,
}
}
}
else if ( event->type == GDK_2BUTTON_PRESS ) {
const char* sh = textureBrowser->shader.c_str();
else if ( event->type == GDK_2BUTTON_PRESS && event->button == 1 ) {
CopiedString texName = textureBrowser->shader;
const char* sh = texName.c_str();
char* dir = strrchr( sh, '/' );
if( dir != NULL ){
*(dir + 1) = '\0';
@@ -1434,12 +1435,13 @@ gboolean TextureBrowser_button_press( GtkWidget* widget, GdkEventButton* event,
if( *dir != '\0'){
ScopeDisableScreenUpdates disableScreenUpdates( dir, "Loading Textures" );
TextureBrowser_ShowDirectory( *textureBrowser, dir );
TextureBrowser_Focus( *textureBrowser, textureBrowser->shader.c_str() );
TextureBrowser_queueDraw( *textureBrowser );
}
}
}
}
else if ( event->type == GDK_3BUTTON_PRESS ) {
else if ( event->type == GDK_2BUTTON_PRESS && event->button == 3 ) {
ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getComonShadersDir(), "Loading Textures" );
TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getComonShadersDir() );
TextureBrowser_queueDraw( *textureBrowser );