servers: Convert to using Set*UIColor.
Signed-off-by: Augustin Cavalier <[email protected]> Patches 0020-0022 from looncraz, unmodified.
This commit is contained in:
committed by
Augustin Cavalier
parent
d231c2a7a5
commit
1a8c00c14b
@@ -117,10 +117,7 @@ void
|
|||||||
DeskbarReplicant::AttachedToWindow()
|
DeskbarReplicant::AttachedToWindow()
|
||||||
{
|
{
|
||||||
BView::AttachedToWindow();
|
BView::AttachedToWindow();
|
||||||
if (Parent())
|
AdoptParentColors();
|
||||||
SetViewColor(Parent()->ViewColor());
|
|
||||||
else
|
|
||||||
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
|
||||||
|
|
||||||
SetLowColor(ViewColor());
|
SetLowColor(ViewColor());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public:
|
|||||||
:
|
:
|
||||||
BView("AppAccessRequestView", B_WILL_DRAW)
|
BView("AppAccessRequestView", B_WILL_DRAW)
|
||||||
{
|
{
|
||||||
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
|
||||||
|
|
||||||
BGroupLayout* rootLayout = new(std::nothrow) BGroupLayout(B_VERTICAL);
|
BGroupLayout* rootLayout = new(std::nothrow) BGroupLayout(B_VERTICAL);
|
||||||
if (rootLayout == NULL)
|
if (rootLayout == NULL)
|
||||||
@@ -87,7 +87,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
message->SetText(details);
|
message->SetText(details);
|
||||||
message->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
message->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
|
||||||
rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
|
rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
|
||||||
message->SetFontAndColor(be_plain_font, B_FONT_ALL, &textColor);
|
message->SetFontAndColor(be_plain_font, B_FONT_ALL, &textColor);
|
||||||
message->MakeEditable(false);
|
message->MakeEditable(false);
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public:
|
|||||||
BView("KeyRequestView", B_WILL_DRAW),
|
BView("KeyRequestView", B_WILL_DRAW),
|
||||||
fPassword(NULL)
|
fPassword(NULL)
|
||||||
{
|
{
|
||||||
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
|
||||||
|
|
||||||
BGroupLayout* rootLayout = new(std::nothrow) BGroupLayout(B_VERTICAL);
|
BGroupLayout* rootLayout = new(std::nothrow) BGroupLayout(B_VERTICAL);
|
||||||
if (rootLayout == NULL)
|
if (rootLayout == NULL)
|
||||||
@@ -108,7 +108,7 @@ public:
|
|||||||
"If you unlock the keyring, it stays unlocked until the system is "
|
"If you unlock the keyring, it stays unlocked until the system is "
|
||||||
"shut down or the keyring is manually locked again.\n"
|
"shut down or the keyring is manually locked again.\n"
|
||||||
"If you cancel this dialog the keyring will remain locked."));
|
"If you cancel this dialog the keyring will remain locked."));
|
||||||
message->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
message->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
|
||||||
rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
|
rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
|
||||||
message->SetFontAndColor(be_plain_font, B_FONT_ALL, &textColor);
|
message->SetFontAndColor(be_plain_font, B_FONT_ALL, &textColor);
|
||||||
message->MakeEditable(false);
|
message->MakeEditable(false);
|
||||||
|
|||||||
@@ -125,12 +125,12 @@ DeskbarView::~DeskbarView()
|
|||||||
void DeskbarView::AttachedToWindow()
|
void DeskbarView::AttachedToWindow()
|
||||||
{
|
{
|
||||||
BView::AttachedToWindow();
|
BView::AttachedToWindow();
|
||||||
if (Parent())
|
AdoptParentColors();
|
||||||
SetViewColor(Parent()->ViewColor());
|
|
||||||
else
|
|
||||||
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
|
||||||
|
|
||||||
SetLowColor(ViewColor());
|
if (ViewUIColor() == B_NO_COLOR)
|
||||||
|
SetLowColor(ViewColor());
|
||||||
|
else
|
||||||
|
SetLowUIColor(ViewUIColor());
|
||||||
|
|
||||||
if (be_roster->IsRunning(B_MAIL_DAEMON_SIGNATURE)) {
|
if (be_roster->IsRunning(B_MAIL_DAEMON_SIGNATURE)) {
|
||||||
_RefreshMailQuery();
|
_RefreshMailQuery();
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ NotificationView::NotificationView(NotificationWindow* win,
|
|||||||
BGroupLayout* layout = new BGroupLayout(B_VERTICAL);
|
BGroupLayout* layout = new BGroupLayout(B_VERTICAL);
|
||||||
SetLayout(layout);
|
SetLayout(layout);
|
||||||
|
|
||||||
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
|
||||||
SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
||||||
|
|
||||||
switch (fNotification->Type()) {
|
switch (fNotification->Type()) {
|
||||||
|
|||||||
@@ -261,7 +261,7 @@ public:
|
|||||||
B_FOLLOW_NONE, 0);
|
B_FOLLOW_NONE, 0);
|
||||||
if (!fRootView)
|
if (!fRootView)
|
||||||
return B_NO_MEMORY;
|
return B_NO_MEMORY;
|
||||||
fRootView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
fRootView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
|
||||||
AddChild(fRootView);
|
AddChild(fRootView);
|
||||||
|
|
||||||
// text view
|
// text view
|
||||||
@@ -269,7 +269,7 @@ public:
|
|||||||
BRect(0, 0, 10, 10), B_FOLLOW_NONE);
|
BRect(0, 0, 10, 10), B_FOLLOW_NONE);
|
||||||
if (!fTextView)
|
if (!fTextView)
|
||||||
return B_NO_MEMORY;
|
return B_NO_MEMORY;
|
||||||
fTextView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
fTextView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
|
||||||
rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
|
rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
|
||||||
fTextView->SetFontAndColor(be_plain_font, B_FONT_ALL, &textColor);
|
fTextView->SetFontAndColor(be_plain_font, B_FONT_ALL, &textColor);
|
||||||
fTextView->MakeEditable(false);
|
fTextView->MakeEditable(false);
|
||||||
|
|||||||
Reference in New Issue
Block a user