Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-29 01:26:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/multi-cursor

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-01-25 00:45:48 -03:00
parent 33d7537ea0 c7a117e88b
commit e7fe64788e
8 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/assets/colorschemes/colorschemes.conf
View File

@@ -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

4
premake4.lua
View File

@@ -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

2
premake5.lua
View File

@@ -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" }

1
src/eepp/graphics/text.cpp
View File

@@ -976,7 +976,6 @@ const Color& Text::getShadowColor() const {
void Text::setShadowColor( const Color& color ) {
mShadowColor = color;
mStyle |= Text::Shadow;
}
const int& Text::getNumLines() {

4
src/eepp/ui/uicodeeditor.cpp
View File

@@ -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;

4
src/eepp/ui/uiconsole.cpp
View File

@@ -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;

4
src/eepp/ui/uitextview.cpp
View File

@@ -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;

7
src/eepp/ui/uitooltip.cpp
View File

@@ -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() );