diff --git a/bin/assets/colorschemes/colorschemes.conf b/bin/assets/colorschemes/colorschemes.conf index 40aec5476..5773324cf 100644 --- a/bin/assets/colorschemes/colorschemes.conf +++ b/bin/assets/colorschemes/colorschemes.conf @@ -110,6 +110,10 @@ literal = #1586d2 string = #1586d2 operator = #fb6620 function = #fc1785 +minimap_visible_area = #00000011 +minimap_current_line = #0000000A +minimap_hover = #00000010 +minimap_highlight = #FF00FFFF [dracula] background = #282a36 @@ -259,6 +263,10 @@ literal = #005cc5 string = #032f62 operator = #d73a49 function = #005cc5 +minimap_visible_area = #00000011 +minimap_current_line = #0000000A +minimap_hover = #00000010 +minimap_highlight = #FF00FFFF [solarized light] background = #fdf6e3 @@ -280,6 +288,10 @@ literal = #2aa198 string = #2aa198 operator = #859900 function = #268bd2 +minimap_visible_area = #00000011 +minimap_current_line = #0000000A +minimap_hover = #00000010 +minimap_highlight = #FF00FFFF [cold lime] background = #073642 @@ -429,6 +441,10 @@ literal = #3daee9 string = #3daee9 operator = #5f7dcd function = #9c53c6 +minimap_visible_area = #00000011 +minimap_current_line = #0000000A +minimap_hover = #00000010 +minimap_highlight = #FF00FFFF [solarobj] background = #fdf6e3 @@ -450,3 +466,7 @@ literal = #b58900 string = #cb4b16 operator = #859900 function = #268bd2 +minimap_visible_area = #00000011 +minimap_current_line = #0000000A +minimap_hover = #00000010 +minimap_highlight = #FF00FFFF diff --git a/premake4.lua b/premake4.lua index 1dcd715c1..0865f72ca 100644 --- a/premake4.lua +++ b/premake4.lua @@ -1310,9 +1310,9 @@ solution "eepp" end if os.is_real("linux") then if _OPTIONS["with-debug-symbols"] then - links { "util", "bfd", "dw", "dl" } + links { "util", "bfd", "dw", "dl", "stdc++fs" } else - links { "util" } + links { "util", "stdc++fs" } end end if (os.is_real("windows") or os.is_real("mingw32") or os.is_real("mingw64")) and _OPTIONS["with-debug-symbols"] then diff --git a/premake5.lua b/premake5.lua index a0b7a987e..eec28fdd4 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1036,7 +1036,7 @@ workspace "eepp" filter { "system:not windows", "system:not haiku" } links { "pthread" } filter "system:linux" - links { "util" } + links { "util", "stdc++fs" } filter { "system:windows", "options:with-debug-symbols" } links { "dbghelp", "psapi" } filter { "system:windows", "options:with-debug-symbols", "options:cc=mingw" } diff --git a/src/eepp/graphics/text.cpp b/src/eepp/graphics/text.cpp index 49048aebb..1dcb1149c 100644 --- a/src/eepp/graphics/text.cpp +++ b/src/eepp/graphics/text.cpp @@ -976,7 +976,6 @@ const Color& Text::getShadowColor() const { void Text::setShadowColor( const Color& color ) { mShadowColor = color; - mStyle |= Text::Shadow; } const int& Text::getNumLines() { diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp index 7155df234..186aad8fd 100644 --- a/src/eepp/ui/uicodeeditor.cpp +++ b/src/eepp/ui/uicodeeditor.cpp @@ -1954,9 +1954,11 @@ bool UICodeEditor::applyProperty( const StyleSheetProperty& attribute ) { case PropertyId::Color: setFontColor( attribute.asColor() ); break; - case PropertyId::TextShadowColor: + case PropertyId::TextShadowColor: { + mFontStyleConfig.Style |= Text::Shadow; setFontShadowColor( attribute.asColor() ); break; + } case PropertyId::TextShadowOffset: setFontShadowOffset( attribute.asVector2f() ); break; diff --git a/src/eepp/ui/uiconsole.cpp b/src/eepp/ui/uiconsole.cpp index bb623427b..9e13e84e0 100644 --- a/src/eepp/ui/uiconsole.cpp +++ b/src/eepp/ui/uiconsole.cpp @@ -142,9 +142,11 @@ bool UIConsole::applyProperty( const StyleSheetProperty& attribute ) { case PropertyId::Color: setFontColor( attribute.asColor() ); break; - case PropertyId::TextShadowColor: + case PropertyId::TextShadowColor: { + mFontStyleConfig.Style |= Text::Shadow; setFontShadowColor( attribute.asColor() ); break; + } case PropertyId::TextShadowOffset: setFontShadowOffset( attribute.asVector2f() ); break; diff --git a/src/eepp/ui/uitextview.cpp b/src/eepp/ui/uitextview.cpp index f31edbb9c..84ce20923 100644 --- a/src/eepp/ui/uitextview.cpp +++ b/src/eepp/ui/uitextview.cpp @@ -675,9 +675,11 @@ bool UITextView::applyProperty( const StyleSheetProperty& attribute ) { case PropertyId::Color: setFontColor( attribute.asColor() ); break; - case PropertyId::TextShadowColor: + case PropertyId::TextShadowColor: { + mFontStyleConfig.Style |= Text::Shadow; setFontShadowColor( attribute.asColor() ); break; + } case PropertyId::TextShadowOffset: setFontShadowOffset( attribute.asVector2f() ); break; diff --git a/src/eepp/ui/uitooltip.cpp b/src/eepp/ui/uitooltip.cpp index b7c9d3635..d909a89f2 100644 --- a/src/eepp/ui/uitooltip.cpp +++ b/src/eepp/ui/uitooltip.cpp @@ -498,10 +498,13 @@ bool UITooltip::applyProperty( const StyleSheetProperty& attribute ) { if ( !mUsingCustomStyling ) setFontColor( attribute.asColor() ); break; - case PropertyId::TextShadowColor: - if ( !mUsingCustomStyling ) + case PropertyId::TextShadowColor: { + if ( !mUsingCustomStyling ) { + mStyleConfig.Style |= Text::Shadow; setFontShadowColor( attribute.asColor() ); + } break; + } case PropertyId::TextShadowOffset: if ( !mUsingCustomStyling ) setFontShadowOffset( attribute.asVector2f() );