added 4 changesets to branch 'refs/remotes/looncraz-github/setviewuicolor'
old head: 7812eb8032a1d5ff14424276327b922880d85b5b
new head: 4f0b5ac5b4da06654b240bfe2ff4c081ce1725de
overview: https://github.com/looncraz/haiku/compare/7812eb8032a1...4f0b5ac5b4da
----------------------------------------------------------------------------
d37762bf4765: CharacterMap Low Color
Force the low color.
f5f686986488: Style cleanup
1aeb25e60e5e: AboutSystem kludge removal
4f0b5ac5b4da: Style Cleanup
Patch-wide style cleanup.
[ looncraz <looncraz@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
25 files changed, 42 insertions(+), 54 deletions(-)
src/apps/aboutsystem/AboutSystem.cpp | 20 +++++++-------------
src/apps/charactermap/CharacterView.cpp | 1 +
src/apps/mediaplayer/interface/DurationView.cpp | 1 +
src/apps/showimage/ShowImageStatusView.cpp | 2 +-
src/kits/interface/AbstractSpinner.cpp | 6 +++---
src/kits/interface/BMCPrivate.cpp | 2 +-
src/kits/interface/Button.cpp | 2 +-
src/kits/interface/ControlLook.cpp | 2 +-
src/kits/interface/StatusBar.cpp | 2 +-
src/kits/interface/Window.cpp | 2 +-
src/kits/tracker/CountView.cpp | 2 +-
src/kits/tracker/InfoWindow.cpp | 2 +-
src/kits/tracker/TextWidget.cpp | 10 +++++-----
.../appearance/AntialiasingSettingsView.cpp | 4 ++--
.../screensaver/ScreenSaverWindow.cpp | 2 +-
src/preferences/time/DateTimeEdit.cpp | 4 ++--
src/servers/app/DelayedMessage.cpp | 4 +---
src/servers/app/DelayedMessageLooper.h | 5 -----
src/servers/app/DelayedMessageThread.cpp | 4 ++--
src/servers/app/DelayedMessageThread.h | 2 +-
src/servers/app/Desktop.cpp | 4 ++--
src/servers/app/Desktop.h | 3 ++-
src/servers/app/View.h | 3 +--
src/servers/app/decorator/TabDecorator.h | 2 +-
src/tests/kits/game/chart/ChartWindow.cpp | 5 ++---
############################################################################
Commit: d37762bf4765d2a7e1dfda415d37006d17505098
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Mon Oct 5 17:16:17 2015 UTC
CharacterMap Low Color
Force the low color.
----------------------------------------------------------------------------
diff --git a/src/apps/charactermap/CharacterView.cpp
b/src/apps/charactermap/CharacterView.cpp
index 2da348b..27db23f 100644
--- a/src/apps/charactermap/CharacterView.cpp
+++ b/src/apps/charactermap/CharacterView.cpp
@@ -238,6 +238,7 @@ CharacterView::AttachedToWindow()
Window()->AddShortcut('C', B_SHIFT_KEY,
new BMessage(kMsgCopyAsEscapedString), this);
SetViewColor(255, 255, 255, 255);
+ SetLowColor(ViewColor());
}
############################################################################
Commit: f5f686986488f4fdce50cfb24e8a18b185bfefcd
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Mon Oct 5 17:17:41 2015 UTC
Style cleanup
----------------------------------------------------------------------------
diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 47fabd6..90f75cf 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -610,7 +610,7 @@ Desktop::DelayedBroadcastToAllWindows(int32 code, bigtime_t
delay,
for (Window* window = fAllWindows.FirstWindow(); window != NULL;
window = window->NextWindow(kAllWindowList)) {
window->ServerWindow()->PostDelayedMessage(code, delay, isDelay,
-
mergeMode);
+ mergeMode);
}
}
@@ -626,7 +626,7 @@ Desktop::DelayedBroadcastToAllWindows(int32 code, int32
data, bigtime_t delay,
for (Window* window = fAllWindows.FirstWindow(); window != NULL;
window = window->NextWindow(kAllWindowList)) {
window->ServerWindow()->PostDelayedMessageWithData(code, data,
delay,
-
isDelay, merge);
+ isDelay, merge);
}
}
diff --git a/src/servers/app/Desktop.h b/src/servers/app/Desktop.h
index 9ca4c3a..1d23dbe 100644
--- a/src/servers/app/Desktop.h
+++ b/src/servers/app/Desktop.h
@@ -56,7 +56,8 @@ namespace BPrivate {
class Desktop : public DesktopObservable, public DelayedMessageLooper,
public ScreenOwner {
public:
- Desktop(uid_t
userID, const char* targetScreen);
+ Desktop(uid_t
userID,
+ const
char* targetScreen);
virtual ~Desktop();
void
RegisterListener(DesktopListener* listener);
############################################################################
Commit: 1aeb25e60e5edffc4210d58091187f7d7f0b064c
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Mon Oct 5 17:26:37 2015 UTC
AboutSystem kludge removal
----------------------------------------------------------------------------
diff --git a/src/apps/aboutsystem/AboutSystem.cpp
b/src/apps/aboutsystem/AboutSystem.cpp
index 715851a..b25c4d0 100644
--- a/src/apps/aboutsystem/AboutSystem.cpp
+++ b/src/apps/aboutsystem/AboutSystem.cpp
@@ -150,7 +150,6 @@ class AboutWindow : public BWindow {
public:
AboutWindow();
- virtual void Show();
virtual bool QuitRequested();
AboutView* fAboutView;
@@ -198,6 +197,7 @@ public:
~AboutView();
virtual void AttachedToWindow();
+ virtual void AllAttached();
virtual void Pulse();
virtual void MessageReceived(BMessage* msg);
@@ -289,17 +289,6 @@ AboutWindow::AboutWindow()
}
-void
-AboutWindow::Show()
-{
- // A horrible kludge...
- BWindow::Show();
- fAboutView->LockLooper();
- fAboutView->_AdjustTextColors();
- fAboutView->UnlockLooper();
-}
-
-
bool
AboutWindow::QuitRequested()
{
@@ -634,11 +623,16 @@ AboutView::AttachedToWindow()
Window()->SetPulseRate(500000);
SetEventMask(B_POINTER_EVENTS);
DoLayout();
- _AdjustTextColors();
}
void
+AboutView::AllAttached()
+{
+ _AdjustTextColors();
+}
+
+void
AboutView::MouseDown(BPoint point)
{
BRect r(92, 26, 105, 31);
############################################################################
Commit: 4f0b5ac5b4da06654b240bfe2ff4c081ce1725de
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Mon Oct 5 18:18:26 2015 UTC
Style Cleanup
Patch-wide style cleanup.
----------------------------------------------------------------------------
diff --git a/src/apps/mediaplayer/interface/DurationView.cpp
b/src/apps/mediaplayer/interface/DurationView.cpp
index 796f180..f0a8b59 100644
--- a/src/apps/mediaplayer/interface/DurationView.cpp
+++ b/src/apps/mediaplayer/interface/DurationView.cpp
@@ -149,6 +149,7 @@ DurationView::_UpdateTextColor()
SetHighColor(mix_color(ViewColor(), ui_color(B_PANEL_TEXT_COLOR), 128));
}
+
void
DurationView::_GenerateString(bigtime_t duration)
{
diff --git a/src/apps/showimage/ShowImageStatusView.cpp
b/src/apps/showimage/ShowImageStatusView.cpp
index e9bd859..436e323 100644
--- a/src/apps/showimage/ShowImageStatusView.cpp
+++ b/src/apps/showimage/ShowImageStatusView.cpp
@@ -92,7 +92,7 @@ ShowImageStatusView::Draw(BRect updateRect)
BRect bounds(Bounds());
rgb_color highColor = ui_color(B_PANEL_TEXT_COLOR);
-
+
SetHighColor(tint_color(ViewColor(), B_DARKEN_2_TINT));
StrokeLine(bounds.LeftTop(), bounds.RightTop());
diff --git a/src/kits/interface/AbstractSpinner.cpp
b/src/kits/interface/AbstractSpinner.cpp
index bd4da86..f426b5e 100644
--- a/src/kits/interface/AbstractSpinner.cpp
+++ b/src/kits/interface/AbstractSpinner.cpp
@@ -324,7 +324,7 @@ SpinnerButton::AttachedToWindow()
{
fParent = static_cast<BAbstractSpinner*>(Parent());
- AdoptParentColors();
+ AdoptParentColors();
BView::AttachedToWindow();
}
@@ -1604,14 +1604,14 @@ BAbstractSpinner::_UpdateTextViewColors(bool enable)
fTextView->SetLowUIColor(ViewUIColor());
} else {
color_which which = ViewUIColor();
-
+
if (which != B_NO_COLOR) {
fTextView->SetViewUIColor(which, B_LIGHTEN_2_TINT);
fTextView->SetLowUIColor(which, B_LIGHTEN_2_TINT);
} else {
rgb_color color = tint_color(ViewColor(),
B_LIGHTEN_2_TINT);
fTextView->SetViewColor(color);
- fTextView->SetLowColor(color);
+ fTextView->SetLowColor(color);
}
}
diff --git a/src/kits/interface/BMCPrivate.cpp
b/src/kits/interface/BMCPrivate.cpp
index f197879..da0058d 100644
--- a/src/kits/interface/BMCPrivate.cpp
+++ b/src/kits/interface/BMCPrivate.cpp
@@ -168,7 +168,7 @@ _BMCMenuBar_::AttachedToWindow()
SetLowColor(Parent()->LowColor());
else
SetLowUIColor(which);
-
+
} else
SetLowUIColor(B_MENU_BACKGROUND_COLOR);
diff --git a/src/kits/interface/Button.cpp b/src/kits/interface/Button.cpp
index b2238fa..3cb7465 100644
--- a/src/kits/interface/Button.cpp
+++ b/src/kits/interface/Button.cpp
@@ -135,7 +135,7 @@ BButton::Draw(BRect updateRect)
// Allow improved customization & integration
float buttonTint = B_DARKEN_1_TINT;
if (ViewUIColor() != B_CONTROL_BACKGROUND_COLOR)
- buttonTint = B_NO_TINT;
+ buttonTint = B_NO_TINT;
BRect rect(Bounds());
rgb_color background = LowColor();
diff --git a/src/kits/interface/ControlLook.cpp
b/src/kits/interface/ControlLook.cpp
index 07d3932..425c90e 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -1798,7 +1798,7 @@ BControlLook::DrawLabel(BView* view, const char* label,
const rgb_color& base,
rgb_color low;
rgb_color color;
rgb_color glowColor;
-
+
if (textColor != NULL)
glowColor = *textColor;
else if (flags & B_IS_CONTROL)
diff --git a/src/kits/interface/StatusBar.cpp b/src/kits/interface/StatusBar.cpp
index a17069b..f909428 100644
--- a/src/kits/interface/StatusBar.cpp
+++ b/src/kits/interface/StatusBar.cpp
@@ -24,7 +24,7 @@
#include <binary_compatibility/Interface.h>
enum internalFlags {
- kCustomBarColor = 1
+ kCustomBarColor = 1
};
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index ef00166..268a1ec 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -774,7 +774,7 @@ BWindow::MessageReceived(BMessage* message)
_SendShowOrHideMessage();
}
-
+
return BLooper::MessageReceived(message);
}
diff --git a/src/kits/tracker/CountView.cpp b/src/kits/tracker/CountView.cpp
index a812486..921c9bb 100644
--- a/src/kits/tracker/CountView.cpp
+++ b/src/kits/tracker/CountView.cpp
@@ -203,7 +203,7 @@ BCountView::Draw(BRect updateRect)
color = ui_color(B_DOCUMENT_BACKGROUND_COLOR);
SetLowColor(color);
- be_control_look->DrawBorder(this, bounds, updateRect,
+ be_control_look->DrawBorder(this, bounds, updateRect,
ui_color(B_NAVIGATION_BASE_COLOR), B_PLAIN_BORDER, 0,
BControlLook::B_BOTTOM_BORDER | BControlLook::B_LEFT_BORDER);
be_control_look->DrawMenuBarBackground(this, bounds, updateRect, color);
diff --git a/src/kits/tracker/InfoWindow.cpp b/src/kits/tracker/InfoWindow.cpp
index 2060255..eead424 100644
--- a/src/kits/tracker/InfoWindow.cpp
+++ b/src/kits/tracker/InfoWindow.cpp
@@ -2306,7 +2306,7 @@ void
TrackingView::Draw(BRect)
{
if (Message() != NULL)
- SetHighUIColor(fMouseInView ? B_LINK_HOVER_COLOR
+ SetHighUIColor(fMouseInView ? B_LINK_HOVER_COLOR
: B_LINK_TEXT_COLOR);
else
SetHighUIColor(B_PANEL_TEXT_COLOR);
diff --git a/src/kits/tracker/TextWidget.cpp b/src/kits/tracker/TextWidget.cpp
index d0636da..6762395 100644
--- a/src/kits/tracker/TextWidget.cpp
+++ b/src/kits/tracker/TextWidget.cpp
@@ -538,11 +538,11 @@ BTextWidget::Draw(BRect eraseRect, BRect textRect, float,
BPoseView* view,
rgb_color highColor;
if (view->IsDesktopWindow()) {
if (selected)
- highColor =
ui_color(B_DOCUMENT_BACKGROUND_COLOR);//kWhite;
+ highColor =
ui_color(B_DOCUMENT_BACKGROUND_COLOR);
else
highColor = view->DeskTextColor();
} else if (selected && view->Window()->IsActive()) {
- highColor =
ui_color(B_DOCUMENT_BACKGROUND_COLOR);//kWhite;;
+ highColor = ui_color(B_DOCUMENT_BACKGROUND_COLOR);
} else
highColor = kBlack;
@@ -575,10 +575,10 @@ BTextWidget::Draw(BRect eraseRect, BRect textRect, float,
BPoseView* view,
BFont font;
drawView->GetFont(&font);
- rgb_color textColor =
ui_color(B_PANEL_TEXT_COLOR);//drawView->HighColor();
- if (textColor.red + textColor.green + textColor.blue < 128 * 3)
{
+ rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
+ if (textColor.Brightness() < 100) {
// dark text on light outline
- rgb_color glowColor = ui_color(B_SHINE_COLOR);//kWhite;;
+ rgb_color glowColor = ui_color(B_SHINE_COLOR);
font.SetFalseBoldWidth(2.0);
drawView->SetFont(&font, B_FONT_FALSE_BOLD_WIDTH);
diff --git a/src/preferences/appearance/AntialiasingSettingsView.cpp
b/src/preferences/appearance/AntialiasingSettingsView.cpp
index 3fa0491..79b7285 100644
--- a/src/preferences/appearance/AntialiasingSettingsView.cpp
+++ b/src/preferences/appearance/AntialiasingSettingsView.cpp
@@ -118,7 +118,7 @@ AntialiasingSettingsView::AntialiasingSettingsView(const
char* name)
// subpixelAntialiasingDisabledLabel
// TODO: Replace with layout friendly constructor once available.
// BRect textBounds = Bounds();
- fSubpixelAntialiasingDisabledLabel
+ fSubpixelAntialiasingDisabledLabel
= new BTextView("unavailable label");
fSubpixelAntialiasingDisabledLabel->SetText(B_TRANSLATE(
"Subpixel based anti-aliasing in combination with glyph hinting
is not "
@@ -332,7 +332,7 @@ AntialiasingSettingsView::_UpdateColors()
#ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
rgb_color infoColor = ui_color(B_PANEL_BACKGROUND_COLOR);
- float tint = B_DARKEN_4_TINT
+ float tint = B_DARKEN_4_TINT
/ (((float)infoColor.Brightness()) / 280.0f);
infoColor = tint_color(infoColor, tint);
diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp
b/src/preferences/screensaver/ScreenSaverWindow.cpp
index bc62b37..1262104 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -391,7 +391,7 @@ FadeView::FadeView(const char* name, ScreenSaverSettings&
settings)
BLayoutBuilder::Group<>(this, B_HORIZONTAL)
.SetInsets(B_USE_SMALL_SPACING)
.Add(box)
- .End();
+ .End();
}
diff --git a/src/preferences/time/DateTimeEdit.cpp
b/src/preferences/time/DateTimeEdit.cpp
index 62dfc04..24fb1c4 100644
--- a/src/preferences/time/DateTimeEdit.cpp
+++ b/src/preferences/time/DateTimeEdit.cpp
@@ -100,7 +100,7 @@ TTimeEdit::DrawSection(uint32 index, BRect bounds, bool
hasFocus)
SetLowColor(mix_color(ui_color(B_CONTROL_HIGHLIGHT_COLOR),
ViewColor(), 192));
else
- SetLowColor(ViewColor());
+ SetLowColor(ViewColor());
BString field;
fText.CopyCharsInto(field, fFieldPositions[index * 2],
@@ -478,7 +478,7 @@ TDateEdit::DrawSection(uint32 index, BRect bounds, bool
hasFocus)
SetLowColor(mix_color(ui_color(B_CONTROL_HIGHLIGHT_COLOR),
ViewColor(), 192));
else
- SetLowColor(ViewColor());
+ SetLowColor(ViewColor());
BString field;
fText.CopyCharsInto(field, fFieldPositions[index * 2],
diff --git a/src/servers/app/DelayedMessage.cpp
b/src/servers/app/DelayedMessage.cpp
index a708caa..6f7d74e 100644
--- a/src/servers/app/DelayedMessage.cpp
+++ b/src/servers/app/DelayedMessage.cpp
@@ -60,8 +60,6 @@ DelayedMessage::HandOff()
return fData;
}
- return NULL;
+ return NULL;
}
-
-
diff --git a/src/servers/app/DelayedMessageLooper.h
b/src/servers/app/DelayedMessageLooper.h
index 6878d63..b12e7e5 100644
--- a/src/servers/app/DelayedMessageLooper.h
+++ b/src/servers/app/DelayedMessageLooper.h
@@ -68,15 +68,10 @@ private:
~DMScheduledMessage();
void Finalize();
-
bigtime_t ScheduledTime() const;
-
status_t SendMessage(port_id
port);
-
bool IsValid() const;
-
bool Merge(DelayedMessage&
message);
-
uint32 FailureCount() const;
private:
diff --git a/src/servers/app/DelayedMessageThread.cpp
b/src/servers/app/DelayedMessageThread.cpp
index b29c958..e378b63 100644
--- a/src/servers/app/DelayedMessageThread.cpp
+++ b/src/servers/app/DelayedMessageThread.cpp
@@ -8,7 +8,7 @@
enum {
kThreadWakeup = 0,
kThreadSleep = 1,
- kThreadExit = 9999
+ kThreadExit = 9999
};
@@ -106,7 +106,7 @@ DelayedMessageThread::_ThreadTask()
for (int32 index = 0; index < fLoopers.CountItems();
++index) {
looper = fLoopers.ItemAt(index);
looper->SendDelayedMessages(&nextDue);
-
+
if (nextDue < nextWakeup)
nextWakeup = nextDue;
}
diff --git a/src/servers/app/DelayedMessageThread.h
b/src/servers/app/DelayedMessageThread.h
index 897a9eb..c58d0d2 100644
--- a/src/servers/app/DelayedMessageThread.h
+++ b/src/servers/app/DelayedMessageThread.h
@@ -26,7 +26,7 @@ private:
static int32 _Thread(void* dmt);
void _ThreadTask();
-
+
BLocker fLock;
ClientList fLoopers;
diff --git a/src/servers/app/View.h b/src/servers/app/View.h
index 0a22039..969669c 100644
--- a/src/servers/app/View.h
+++ b/src/servers/app/View.h
@@ -108,9 +108,8 @@ public:
void CollectTokensForChildren(BList*
tokenMap) const;
void FindViews(uint32 flags,
BObjectList<View>& list,
int32& left);
-
- bool HasView(View* view);
+ bool HasView(View* view);
View* ViewAt(const BPoint& where);
// coordinate conversion
diff --git a/src/servers/app/decorator/TabDecorator.h
b/src/servers/app/decorator/TabDecorator.h
index 40ae877..ac75dae 100644
--- a/src/servers/app/decorator/TabDecorator.h
+++ b/src/servers/app/decorator/TabDecorator.h
@@ -72,7 +72,7 @@ public:
int32
tab = -1);
virtual void UpdateColors(DesktopSettings&
settings);
-
+
protected:
virtual void _DoLayout();
virtual void _DoTabLayout();
diff --git a/src/tests/kits/game/chart/ChartWindow.cpp
b/src/tests/kits/game/chart/ChartWindow.cpp
index a07ae39..832eb1d 100644
--- a/src/tests/kits/game/chart/ChartWindow.cpp
+++ b/src/tests/kits/game/chart/ChartWindow.cpp
@@ -902,12 +902,11 @@ ChartWindow::ChartWindow(BRect frame, const char *name)
/*Resize Window Height to fit contents, if needed*/
r = Bounds();
- r.bottom = fSpecialBox->Frame().bottom + H_BORDER*2 + 20;
-
+ r.bottom = fSpecialBox->Frame().bottom + H_BORDER * 2 + 20;
+
if (r.Height() > Bounds().Height())
ResizeTo(r.Width(), r.Height());
-
/* allocate the semaphores */
fDrawingLock = create_sem(1, "chart locker");
fSecondThreadLock = create_sem(0, "chart second locker");
