From ee06831f97e2cc08c5a5311e7cc8745c974de843 Mon Sep 17 00:00:00 2001 From: Garux Date: Mon, 15 Nov 2021 01:59:23 +0300 Subject: [PATCH] Optional grid color scheme to fit the Adwaita Dark GTK theme --- radiant/mainframe.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index f161c64a..450a4949 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -882,6 +882,31 @@ void ColorScheme_Blender(){ XY_UpdateAllWindows(); } +/* color scheme to fit the GTK Adwaita Dark theme */ +void ColorScheme_AdwaitaDark() +{ + TextureBrowser_setBackgroundColour( GlobalTextureBrowser(), Vector3( 0.25f, 0.25f, 0.25f ) ); + + g_camwindow_globals.color_cameraback = Vector3( 0.25f, 0.25f, 0.25f ); + g_camwindow_globals.color_selbrushes3d = Vector3( 1.0f, 0.0f, 0.0f ); + CamWnd_reconstructStatic(); + CamWnd_Update( *g_pParentWnd->GetCamWnd() ); + + g_xywindow_globals.color_gridback = Vector3( 0.25f, 0.25f, 0.25f ); + g_xywindow_globals.color_gridminor = Vector3( 0.21f, 0.23f, 0.23f ); + g_xywindow_globals.color_gridmajor = Vector3( 0.14f, 0.15f, 0.15f ); + g_xywindow_globals.color_gridblock = Vector3( 1.0f, 1.0f, 1.0f ); + g_xywindow_globals.color_gridtext = Vector3( 0.0f, 0.0f, 0.0f ); + g_xywindow_globals.color_selbrushes = Vector3( 1.0f, 0.0f, 0.0f ); + XYWnd::recaptureStates(); + g_xywindow_globals.color_clipper = Vector3( 0.0f, 0.0f, 1.0f ); + Brush_clipperColourChanged(); + g_xywindow_globals.color_brushes = Vector3( 0.73f, 0.73f, 0.73f ); + SetWorldspawnColour( g_xywindow_globals.color_brushes ); + g_xywindow_globals.color_viewname = Vector3( 0.5f, 0.0f, 0.75f ); + XY_UpdateAllWindows(); +} + typedef Callback1 GetColourCallback; typedef Callback1 SetColourCallback; @@ -1004,6 +1029,7 @@ GtkMenuItem* create_colours_menu(){ create_menu_item_with_mnemonic( menu_3, "Black and Green", "ColorSchemeBlackAndGreen" ); create_menu_item_with_mnemonic( menu_3, "Maya/Max/Lightwave Emulation", "ColorSchemeYdnar" ); create_menu_item_with_mnemonic( menu_3, "Blender/Dark", "ColorSchemeBlender" ); + create_menu_item_with_mnemonic( menu_3, "Adwaita Dark", "ColorSchemeAdwaitaDark" ); create_menu_item_with_mnemonic( menu_in_menu, "GTK Theme...", "gtkThemeDlg" ); create_menu_item_with_mnemonic( menu_in_menu, "OpenGL Font...", "OpenGLFont" ); @@ -3638,6 +3664,7 @@ void MainFrame_Construct(){ GlobalCommands_insert( "ColorSchemeBlackAndGreen", FreeCaller() ); GlobalCommands_insert( "ColorSchemeYdnar", FreeCaller() ); GlobalCommands_insert( "ColorSchemeBlender", FreeCaller() ); + GlobalCommands_insert( "ColorSchemeAdwaitaDark", FreeCaller() ); GlobalCommands_insert( "ChooseTextureBackgroundColor", makeCallback( g_ColoursMenu.m_textureback ) ); GlobalCommands_insert( "ChooseGridBackgroundColor", makeCallback( g_ColoursMenu.m_xyback ) ); GlobalCommands_insert( "ChooseGridMajorColor", makeCallback( g_ColoursMenu.m_gridmajor ) );