i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep color control enabled after color scheme change

Browse Source 
Fixes #9532
This commit is contained in:
Siarzhuk Zharski
2013-03-29 16:26:32 +01:00
parent 19bfeaa786
commit 15aa771390
2 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/AppearPrefView.cpp
+14 -25
View File
@@ -104,7 +104,6 @@ AppearancePrefView::AppearancePrefView(const char* name,
kColorTable[0]); kColorTable[0]);
fColorField = new BMenuField(B_TRANSLATE("Color:"), colorsPopUp); fColorField = new BMenuField(B_TRANSLATE("Color:"), colorsPopUp);
fColorField->SetEnabled(false);
fTabTitle = new BTextControl("tabTitle", B_TRANSLATE("Tab title:"), "", fTabTitle = new BTextControl("tabTitle", B_TRANSLATE("Tab title:"), "",
NULL); NULL);
@@ -151,7 +150,6 @@ AppearancePrefView::AppearancePrefView(const char* name,
fTabTitle->SetText(PrefHandler::Default()->getString(PREF_TAB_TITLE)); fTabTitle->SetText(PrefHandler::Default()->getString(PREF_TAB_TITLE));
fWindowTitle->SetText(PrefHandler::Default()->getString(PREF_WINDOW_TITLE)); fWindowTitle->SetText(PrefHandler::Default()->getString(PREF_WINDOW_TITLE));
fColorControl->SetEnabled(false);
fColorControl->SetValue( fColorControl->SetValue(
PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR)); PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR));
@@ -219,16 +217,11 @@ AppearancePrefView::AttachedToWindow()
fontSizeMenu->SetTargetForItems(this); fontSizeMenu->SetTargetForItems(this);
} }
fColorControl->SetTarget(this); fColorControl->SetTarget(this);
fColorField->Menu()->SetTargetForItems(this); fColorField->Menu()->SetTargetForItems(this);
fColorSchemeField->Menu()->SetTargetForItems(this); fColorSchemeField->Menu()->SetTargetForItems(this);
_SetCurrentColorScheme(fColorSchemeField); _SetCurrentColorScheme();
bool enableCustomColors =
strcmp(fColorSchemeField->Menu()->FindMarked()->Label(),
gCustomColorScheme.name) == 0;
_EnableCustomColors(enableCustomColors);
} }
@@ -279,6 +272,15 @@ AppearancePrefView::MessageReceived(BMessage* msg)
break; break;
rgb_color oldColor = PrefHandler::Default()->getRGB(label); rgb_color oldColor = PrefHandler::Default()->getRGB(label);
if (oldColor != fColorControl->ValueAsColor()) { if (oldColor != fColorControl->ValueAsColor()) {
BMenuItem* item = fColorSchemeField->Menu()->FindMarked();
if (strcmp(item->Label(), gCustomColorScheme.name) != 0) {
item->SetMarked(false);
item = fColorSchemeField->Menu()->FindItem(
gCustomColorScheme.name);
if (item)
item->SetMarked(true);
}
PrefHandler::Default()->setRGB(label, PrefHandler::Default()->setRGB(label,
fColorControl->ValueAsColor()); fColorControl->ValueAsColor());
modified = true; modified = true;
@@ -291,11 +293,6 @@ AppearancePrefView::MessageReceived(BMessage* msg)
color_scheme* newScheme = NULL; color_scheme* newScheme = NULL;
if (msg->FindPointer("color_scheme", if (msg->FindPointer("color_scheme",
(void**)&newScheme) == B_OK) { (void**)&newScheme) == B_OK) {
if (newScheme == &gCustomColorScheme)
_EnableCustomColors(true);
else
_EnableCustomColors(false);
_ChangeColorScheme(newScheme); _ChangeColorScheme(newScheme);
modified = true; modified = true;
} }
@@ -365,14 +362,6 @@ AppearancePrefView::MessageReceived(BMessage* msg)
} }
void
AppearancePrefView::_EnableCustomColors(bool enable)
{
fColorField->SetEnabled(enable);
fColorControl->SetEnabled(enable);
}
void void
AppearancePrefView::_ChangeColorScheme(color_scheme* scheme) AppearancePrefView::_ChangeColorScheme(color_scheme* scheme)
{ {
@@ -388,7 +377,7 @@ AppearancePrefView::_ChangeColorScheme(color_scheme* scheme)
void void
AppearancePrefView::_SetCurrentColorScheme(BMenuField* field) AppearancePrefView::_SetCurrentColorScheme()
{ {
PrefHandler* pref = PrefHandler::Default(); PrefHandler* pref = PrefHandler::Default();
src/apps/terminal/AppearPrefView.h
+1 -3
View File
@@ -54,10 +54,8 @@ public:
float* _height); float* _height);
private: private:
void _EnableCustomColors(bool enable);
void _ChangeColorScheme(color_scheme* scheme); void _ChangeColorScheme(color_scheme* scheme);
void _SetCurrentColorScheme(BMenuField* field); void _SetCurrentColorScheme();
static BMenu* _MakeFontMenu(uint32 command, static BMenu* _MakeFontMenu(uint32 command,
const char* defaultFamily, const char* defaultFamily,