Skip to content

Commit 7317c1f

Browse files
author
Joachim Meyer
committed
Makes PolyUIMenuBar more customizable (Fixes: #387)
1 parent 35aedc4 commit 7317c1f

File tree

10 files changed

+15
-4
lines changed

10 files changed

+15
-4
lines changed

‎Assets/UIThemes.pak‎

-78 Bytes
Binary file not shown.

‎Assets/UIThemes/dark/theme.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
1313
<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
1414
<uiSectionFontColor>0x00000080</uiSectionFontColor>
15+
<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
1516

1617
<uiTextInputFontName>sans</uiTextInputFontName>
1718
<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

‎Assets/UIThemes/dark_retina/theme.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
1313
<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
1414
<uiSectionFontColor>0x00000080</uiSectionFontColor>
15+
<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
1516

1617
<uiTextInputFontName>sans</uiTextInputFontName>
1718
<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

‎Assets/UIThemes/default/theme.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
1313
<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
1414
<uiSectionFontColor>0x00000080</uiSectionFontColor>
15+
<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
1516

1617
<uiTextInputFontName>sans</uiTextInputFontName>
1718
<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

‎Assets/UIThemes/default_retina/theme.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
1313
<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
1414
<uiSectionFontColor>0x00000080</uiSectionFontColor>
15+
<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
1516

1617
<uiTextInputFontName>sans</uiTextInputFontName>
1718
<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

‎IDE/Contents/Resources/UIThemes/dark/theme.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
1313
<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
1414
<uiSectionFontColor>0x00000080</uiSectionFontColor>
15+
<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
1516

1617
<uiTextInputFontName>sans</uiTextInputFontName>
1718
<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

‎IDE/Contents/Resources/UIThemes/dark_retina/theme.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
1313
<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
1414
<uiSectionFontColor>0x00000080</uiSectionFontColor>
15+
<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
1516

1617
<uiTextInputFontName>sans</uiTextInputFontName>
1718
<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

‎IDE/Contents/Resources/UIThemes/default/theme.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
1313
<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
1414
<uiSectionFontColor>0x00000080</uiSectionFontColor>
15-
15+
<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
16+
1617
<uiTextInputFontName>sans</uiTextInputFontName>
1718
<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
1819
<uiDefaultFontSize>12</uiDefaultFontSize>

‎IDE/Contents/Resources/UIThemes/default_retina/theme.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
1313
<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
1414
<uiSectionFontColor>0x00000080</uiSectionFontColor>
15+
<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
1516

1617
<uiTextInputFontName>sans</uiTextInputFontName>
1718
<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

‎Modules/Contents/UI/Source/PolyUIMenuBar.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ UIMenuBarEntry::UIMenuBarEntry(String name): UIElement() {
4646
bg->setAnchorPoint(-1.0, -1.0, 0.0);
4747
addChild(bg);
4848
bg->processInputEvents = true;
49-
bg->color.setColorHex(0x00000000);
49+
bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiMenuBarBgColor"));
5050
addChild(label);
5151
label->setPosition(10, 5);
5252
}
@@ -56,7 +56,7 @@ void UIMenuBarEntry::Select() {
5656
}
5757

5858
void UIMenuBarEntry::Deselect() {
59-
bg->color.setColorHex(0x00000000);
59+
bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiMenuBarBgColor"));
6060
}
6161

6262
void UIMenuBarEntry::addItem(String name, String code, PolyKEY shortCut1, PolyKEY shortCut2) {
@@ -69,12 +69,15 @@ UIMenuBarEntry::~UIMenuBarEntry() {
6969
}
7070

7171
UIMenuBar::UIMenuBar(int width, UIGlobalMenu *globalMenu) : UIElement() {
72+
Config *conf = CoreServices::getInstance()->getConfig();
7273

7374
this->globalMenu = globalMenu;
7475

7576
bgShape = new UIRect(width, 25);
7677
addChild(bgShape);
77-
bgShape->setColor(0.0, 0.0, 0.0, 1.0);
78+
Color bgColor = new Color();
79+
bgColor.setColorHexFromString(conf->getStringValue("Polycode", "uiMenuBarBgColor"));
80+
bgShape->setColor(bgColor);
7881
bgShape->setAnchorPoint(-1.0, -1.0, 0.0);
7982
entryOffset = 0;
8083

0 commit comments

Comments
 (0)