* fix: parsing of /* */ comments, having * or / inside

Radiant:

misc...
	encapsulate RETURN_FALSE_IF_FAIL macros with do while 0: minus warnings
	* button to call color selector from ents inspector color entry
	* explanatory text on initial engine path configuration
	* don't show Global preferences by default, except first start
	* activate {xyview, camera, texbro glwidget} on mouse button press and scroll, so {texbro treeview and console} hotkeys do not override global ones
	* activate windows, containing xyview, camera, texbro on mouse scroll
	* fix: autoapplying trigger texture on entity creation is undoable
	* fix: texbro m1/2 x2 work, when some tag is loaded
	* bold key and spawnflags names in entity inspector entity description
	* fix: +CameraFreeMove* command, +shift, -CameraFreeMove*, -shift = still moving (reason: caps letter)
This commit is contained in:
Garux
2017-08-02 09:20:56 +03:00
parent 2ab47003e0
commit 461d008daa
18 changed files with 150 additions and 33 deletions

View File

@@ -335,10 +335,10 @@ TextureBrowser() :
m_rmbSelected( false ),
m_searchedTags( false ),
m_tags( false ),
m_move_started( false ),
m_uniformTextureSize( 160 ),
m_uniformTextureMinSize( 48 ),
m_hideNonShadersInCommon( true ),
m_move_started( false ){
m_hideNonShadersInCommon( true ){
}
};
@@ -779,6 +779,7 @@ void visit( const char* minor, const _QERPlugImageTable& table ) const {
};
void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* directory ){
textureBrowser.m_searchedTags = false;
if ( TextureBrowser_showWads() ) {
Archive* archive = GlobalFileSystem().getArchive( directory );
ASSERT_NOTNULL( archive );
@@ -1377,6 +1378,7 @@ void BuildStoreAvailableTags( GtkListStore* storeAvailable,
gboolean TextureBrowser_button_press( GtkWidget* widget, GdkEventButton* event, TextureBrowser* textureBrowser ){
if ( event->type == GDK_BUTTON_PRESS ) {
gtk_widget_grab_focus( widget );
if ( event->button == 3 ) {
if ( GlobalTextureBrowser().m_tags ) {
textureBrowser->m_rmbSelected = true;
@@ -1451,6 +1453,10 @@ gboolean TextureBrowser_motion( GtkWidget *widget, GdkEventMotion *event, Textur
}
gboolean TextureBrowser_scroll( GtkWidget* widget, GdkEventScroll* event, TextureBrowser* textureBrowser ){
gtk_widget_grab_focus( widget );
if( !gtk_window_is_active( textureBrowser->m_parent ) )
gtk_window_present( textureBrowser->m_parent );
if ( event->direction == GDK_SCROLL_UP ) {
TextureBrowser_MouseWheel( *textureBrowser, true );
}
@@ -2048,7 +2054,7 @@ void TextureBrowser_SetNotex(){
name << GlobalRadiant().getAppPath() << "bitmaps/notex.png";
g_notex = name.c_str();
name = NULL;
name.clear();
name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.png";
g_shadernotex = name.c_str();
}