Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
SpartanJ committed Jan 25, 2023
1 parent 69ec3d2 commit c7a117e
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 6 deletions.
20 changes: 20 additions & 0 deletions bin/assets/colorschemes/colorschemes.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
1 change: 0 additions & 1 deletion src/eepp/graphics/text.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,6 @@ const Color& Text::getShadowColor() const {

void Text::setShadowColor( const Color& color ) {
mShadowColor = color;
mStyle |= Text::Shadow;
}

const int& Text::getNumLines() {
Expand Down
4 changes: 3 additions & 1 deletion src/eepp/ui/uicodeeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1937,9 +1937,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;
Expand Down
4 changes: 3 additions & 1 deletion src/eepp/ui/uiconsole.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/eepp/ui/uitextview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions src/eepp/ui/uitooltip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
Expand Down

0 comments on commit c7a117e

Please sign in to comment.