Explorar o código

Makes PolyUIMenuBar more customizable (Fixes: #387)

Joachim Meyer %!s(int64=11) %!d(string=hai) anos
pai
achega
7317c1f332

BIN=BIN
Assets/UIThemes.pak


+ 1 - 0
Assets/UIThemes/dark/theme.xml

@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

+ 1 - 0
Assets/UIThemes/dark_retina/theme.xml

@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

+ 1 - 0
Assets/UIThemes/default/theme.xml

@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

+ 1 - 0
Assets/UIThemes/default_retina/theme.xml

@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

+ 1 - 0
IDE/Contents/Resources/UIThemes/dark/theme.xml

@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

+ 1 - 0
IDE/Contents/Resources/UIThemes/dark_retina/theme.xml

@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

+ 2 - 1
IDE/Contents/Resources/UIThemes/default/theme.xml

@@ -12,7 +12,8 @@
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
-
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
+	
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiDefaultFontSize>12</uiDefaultFontSize>
 	<uiDefaultFontSize>12</uiDefaultFontSize>

+ 1 - 0
IDE/Contents/Resources/UIThemes/default_retina/theme.xml

@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>

+ 6 - 3
Modules/Contents/UI/Source/PolyUIMenuBar.cpp

@@ -46,7 +46,7 @@ UIMenuBarEntry::UIMenuBarEntry(String name): UIElement() {
 	bg->setAnchorPoint(-1.0, -1.0, 0.0);
 	bg->setAnchorPoint(-1.0, -1.0, 0.0);
 	addChild(bg);
 	addChild(bg);
 	bg->processInputEvents = true;
 	bg->processInputEvents = true;
-	bg->color.setColorHex(0x00000000);
+	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiMenuBarBgColor"));
 	addChild(label);
 	addChild(label);
 	label->setPosition(10, 5);
 	label->setPosition(10, 5);
 }
 }
@@ -56,7 +56,7 @@ void UIMenuBarEntry::Select() {
 }
 }
 
 
 void UIMenuBarEntry::Deselect() {
 void UIMenuBarEntry::Deselect() {
-	bg->color.setColorHex(0x00000000);
+	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiMenuBarBgColor"));
 }
 }
 
 
 void UIMenuBarEntry::addItem(String name, String code, PolyKEY shortCut1, PolyKEY shortCut2) {
 void UIMenuBarEntry::addItem(String name, String code, PolyKEY shortCut1, PolyKEY shortCut2) {
@@ -69,12 +69,15 @@ UIMenuBarEntry::~UIMenuBarEntry() {
 }
 }
 
 
 UIMenuBar::UIMenuBar(int width, UIGlobalMenu *globalMenu) : UIElement() {
 UIMenuBar::UIMenuBar(int width, UIGlobalMenu *globalMenu) : UIElement() {
+	Config *conf = CoreServices::getInstance()->getConfig();
 
 
 	this->globalMenu = globalMenu;
 	this->globalMenu = globalMenu;
 
 
 	bgShape = new UIRect(width, 25);
 	bgShape = new UIRect(width, 25);
 	addChild(bgShape);
 	addChild(bgShape);
-	bgShape->setColor(0.0, 0.0, 0.0, 1.0);
+	Color bgColor = new Color();
+	bgColor.setColorHexFromString(conf->getStringValue("Polycode", "uiMenuBarBgColor"));
+	bgShape->setColor(bgColor);
 	bgShape->setAnchorPoint(-1.0, -1.0, 0.0);
 	bgShape->setAnchorPoint(-1.0, -1.0, 0.0);
 	entryOffset = 0;
 	entryOffset = 0;