Skip to content

Commit b6844c7

Browse files
committed
merge
2 parents 9460fd3 + 5d19a87 commit b6844c7

21 files changed

+77
-2104
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Changes in my branch
8787
- Carousel supports element "logoPos" : this allows the logo not to be inevitably centered.
8888
- Image loading : the image bytes where duplicated 3 times in memory.
8989
- In previous versions, if a xml element was unknown in the theme, nothing was loaded.
90+
- Support for glows around text
9091
- Reflection for images ( table reflection effect )
9192
- Gradients for selected menu and list items.
9293

THEMES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,10 @@ Can be created as an extra.
722722
* `lineSpacing` - type: FLOAT. Controls the space between lines (as a multiple of font height). Default is 1.5.
723723
* `zIndex` - type: FLOAT.
724724
- z-index value for component. Components will be rendered in order of z-index value from low to high.
725+
* `glowColor` - type: COLOR;
726+
- NEW : Defines the color of the glow around the text.
727+
* `glowSize` - type: FLOAT.
728+
- NEW : Defines the size of the glow around the text.
725729
726730
#### textlist
727731

es-app/src/guis/GuiMenu.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,11 +552,11 @@ void GuiMenu::openUISettings()
552552

553553
//#ifndef WIN32
554554
//UI mode
555-
auto UImodeSelection = std::make_shared< OptionListComponent<std::string> >(mWindow, "UI MODE", false);
555+
auto UImodeSelection = std::make_shared< OptionListComponent<std::string> >(mWindow, _T("UI MODE"), false);
556556
std::vector<std::string> UImodes = UIModeController::getInstance()->getUIModes();
557557
for (auto it = UImodes.cbegin(); it != UImodes.cend(); it++)
558-
UImodeSelection->add(*it, *it, Settings::getInstance()->getString("UIMode") == *it);
559-
s->addWithLabel("UI MODE", UImodeSelection);
558+
UImodeSelection->add(_L(*it), *it, Settings::getInstance()->getString("UIMode") == *it);
559+
s->addWithLabel(_T("UI MODE"), UImodeSelection);
560560
Window* window = mWindow;
561561
s->addSaveFunc([UImodeSelection, window]
562562
{

resources/OpenSans-CondBold.ttf

258 KB
Binary file not shown.

resources/OpenSans-CondLight.ttf

216 KB
Binary file not shown.

resources/arrow.svg

Lines changed: 1 addition & 4 deletions
Loading

resources/button.png

-875 Bytes
Loading

resources/button_filled.png

-893 Bytes
Loading

resources/checkbox_checked.svg

Lines changed: 1 addition & 6 deletions
Loading

resources/checkbox_unchecked.svg

Lines changed: 1 addition & 4 deletions
Loading

0 commit comments

Comments
 (0)