added 3 changesets to branch 'refs/remotes/looncraz-github/setviewuicolor'
old head: ed540acfc86afe4f1e207739844cc732a35b7e11
new head: 43f7595eb1b211c01c887eebc9722ffbb7ae146c
overview: https://github.com/looncraz/haiku/compare/ed540acfc86a...43f7595eb1b2
----------------------------------------------------------------------------
ad2caa45f2dd: Custom Color Memory/Tint Issue
Did not set the proper flag when instantiating from an archive.
Tinted the control mark color, when it should not have been.
26161b82b2a2: Style Cleanup
Missed some extra tabs, mostly.
43f7595eb1b2: Remove Cruft
AS_COLOR_UPDATED is no longer needed as only the pending color map is
what is updated. AS_COLOR_SET_UPDATED was changed to AS_COLOR_MAP_UPDATED.
Removed LockedDesktopSettings::SetUIColor() as it no longer serves a purpose.
[ looncraz <looncraz@xxxxxxxxxxxx> ]
----------------------------------------------------------------------------
11 files changed, 20 insertions(+), 63 deletions(-)
headers/private/app/ServerProtocol.h | 3 +--
headers/private/interface/ColorMapPrivate.h | 4 ++--
src/kits/interface/ColorMap.cpp | 8 +++----
src/kits/interface/StatusBar.cpp | 10 ++++----
src/servers/app/DelayedMessagePrivate.cpp | 2 +-
src/servers/app/DelayedMessageSender.cpp | 4 ++--
src/servers/app/DelayedMessageSender.h | 2 +-
src/servers/app/DesktopSettings.cpp | 14 +----------
src/servers/app/DesktopSettings.h | 2 --
src/servers/app/ProfileMessageSupport.cpp | 3 +--
src/servers/app/ServerWindow.cpp | 31 ++-----------------------
############################################################################
Commit: ad2caa45f2ddec757a9b71d94139c917a206b6b8
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Fri Oct 23 02:33:42 2015 UTC
Custom Color Memory/Tint Issue
Did not set the proper flag when instantiating from an archive.
Tinted the control mark color, when it should not have been.
----------------------------------------------------------------------------
diff --git a/src/kits/interface/StatusBar.cpp b/src/kits/interface/StatusBar.cpp
index cc34c93..dffb30a 100644
--- a/src/kits/interface/StatusBar.cpp
+++ b/src/kits/interface/StatusBar.cpp
@@ -71,8 +71,10 @@ BStatusBar::BStatusBar(BMessage *archive)
}
int32 color;
- if (archive->FindInt32("_bcolor", (int32 *)&color) == B_OK)
+ if (archive->FindInt32("_bcolor", (int32 *)&color) == B_OK) {
fBarColor = *(rgb_color *)&color;
+ fInternalFlags |= kCustomBarColor;
+ }
if (archive->FindFloat("_val", &floatValue) == B_OK)
fCurrent = floatValue;
@@ -145,10 +147,8 @@ BStatusBar::AttachedToWindow()
fTextDivider = Bounds().Width();
- if (!(fInternalFlags & kCustomBarColor)) {
- fBarColor = tint_color(ui_color(B_CONTROL_MARK_COLOR),
- B_DARKEN_1_TINT);
- }
+ if ((fInternalFlags & kCustomBarColor) == 0)
+ fBarColor = ui_color(B_CONTROL_MARK_COLOR);
}
############################################################################
Commit: 26161b82b2a2e509fb2113f5d5a349a5e63c75d0
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Fri Oct 23 02:34:50 2015 UTC
Style Cleanup
Missed some extra tabs, mostly.
----------------------------------------------------------------------------
diff --git a/headers/private/interface/ColorMapPrivate.h
b/headers/private/interface/ColorMapPrivate.h
index 7c501bb..5dc04dd 100644
--- a/headers/private/interface/ColorMapPrivate.h
+++ b/headers/private/interface/ColorMapPrivate.h
@@ -52,7 +52,7 @@ enum {
B_CM_STEAL_DATA = 1,// Take the data, and reset the colormap
// The given color map will get a new, clean, data object, and
// the caller will take ownership of the acquired data.
-
+
B_CM_COPY_DATA = 2 // Copy the data, release to destroy
copy
};
@@ -66,7 +66,7 @@ public:
static void
ReleaseData(BColorMapData* data,
int32
count = 1,
bool
ensureDestruction = false);
-};
+};
}; // end namespace BPrivate
diff --git a/src/kits/interface/ColorMap.cpp b/src/kits/interface/ColorMap.cpp
index 9257c94..a044bc2 100644
--- a/src/kits/interface/ColorMap.cpp
+++ b/src/kits/interface/ColorMap.cpp
@@ -31,7 +31,7 @@ static BColorMap* be_default_colormap = NULL;
static BColorMap* be_current_colormap = NULL;
-static const rgb_color kFailureColor = make_color(0,0,0,0);
+static const rgb_color kFailureColor = make_color(0, 0, 0, 0);
BColorMap::BColorMap()
@@ -501,7 +501,7 @@ BColorMap::PrintToStream() const
printf("BColorMap: ERROR: NULL DATA!\n");
return;
}
-
+
BAutolock _(fData);
printf("BColorMap: %li colors {\n", CountColors());
@@ -591,7 +591,7 @@ BColorMap::_InitCopyOnWrite()
return B_OK;
}
- return B_OK;
+ return B_OK;
}
@@ -707,7 +707,7 @@ BColorMapData::GetNext(int32* cookie, color_which* key,
rgb_color* color)
// increment no matter what, some errors may be ignored by the caller...
*cookie = *cookie + 1;
- return error;
+ return error;
}
diff --git a/src/servers/app/DelayedMessagePrivate.cpp
b/src/servers/app/DelayedMessagePrivate.cpp
index 74ae54b..abb575d 100644
--- a/src/servers/app/DelayedMessagePrivate.cpp
+++ b/src/servers/app/DelayedMessagePrivate.cpp
@@ -43,7 +43,7 @@ DelayedMessageData::DelayedMessageData(port_id port, int32
code,
fScheduledTime += currentTime;
} else if (delayMode == B_ABSOLUTE_TIMEOUT) {
if (fScheduledTime - currentTime > DM_MAX_DELAY)
- fScheduledTime = currentTime + DM_MINIMUM_DELAY;
+ fScheduledTime = currentTime + DM_MINIMUM_DELAY;
}
}
diff --git a/src/servers/app/DelayedMessageSender.cpp
b/src/servers/app/DelayedMessageSender.cpp
index 4789126..d1682d4 100644
--- a/src/servers/app/DelayedMessageSender.cpp
+++ b/src/servers/app/DelayedMessageSender.cpp
@@ -161,7 +161,7 @@ DelayedMessageSender::_MessageLoop()
}
// port deleted?
- if (status < B_OK)
+ if (status < B_OK)
break;
}
}
@@ -221,7 +221,7 @@ DelayedMessageSender::_SendDelayedMessages()
fMessages.RemoveItem(remove.ItemAt(index));
atomic_add64(&fSentCount, sent);
-
+
// catch any partly-failed messages (possibly late):
if (fMessages.CountItems() > 0
&& atomic_get64(&fScheduledWakeup) == B_INFINITE_TIMEOUT) {
diff --git a/src/servers/app/DelayedMessageSender.h
b/src/servers/app/DelayedMessageSender.h
index bdfb5d1..05acad2 100644
--- a/src/servers/app/DelayedMessageSender.h
+++ b/src/servers/app/DelayedMessageSender.h
@@ -39,7 +39,7 @@ private:
BObjectList<DMScheduledMessage> fMessages;
bigtime_t fScheduledWakeup;
-
+
int32 fWakeupRetry;
thread_id fThread;
############################################################################
Commit: 43f7595eb1b211c01c887eebc9722ffbb7ae146c
Author: looncraz <looncraz@xxxxxxxxxxxx>
Date: Fri Oct 23 02:41:22 2015 UTC
Remove Cruft
AS_COLOR_UPDATED is no longer needed as only the pending color map is
what is updated. AS_COLOR_SET_UPDATED was changed to AS_COLOR_MAP_UPDATED.
Removed LockedDesktopSettings::SetUIColor() as it no longer serves a purpose.
----------------------------------------------------------------------------
diff --git a/headers/private/app/ServerProtocol.h
b/headers/private/app/ServerProtocol.h
index 397cd1a..267cfa3 100644
--- a/headers/private/app/ServerProtocol.h
+++ b/headers/private/app/ServerProtocol.h
@@ -349,8 +349,7 @@ enum {
AS_VIEW_GET_FILL_RULE,
// Internal messages
- AS_COLOR_UPDATED,
- AS_COLOR_SET_UPDATED,
+ AS_COLOR_MAP_UPDATED,
AS_LAST_CODE
};
diff --git a/src/servers/app/DesktopSettings.cpp
b/src/servers/app/DesktopSettings.cpp
index f652cbf..8a2a093 100644
--- a/src/servers/app/DesktopSettings.cpp
+++ b/src/servers/app/DesktopSettings.cpp
@@ -1029,18 +1029,6 @@ LockedDesktopSettings::SetShowAllDraggers(bool show)
void
-LockedDesktopSettings::SetUIColor(color_which which, const rgb_color color)
-{
- bool changed = false;
- fSettings->SetUIColor(which, color, &changed);
-
- // only send when color changed from previous value
- if (changed)
- fDesktop->BroadcastToAllWindows(AS_COLOR_UPDATED, (int32)which);
-}
-
-
-void
LockedDesktopSettings::SetUIColors(BColorMap& colorSet, bool moveData)
{
using namespace BPrivate;
@@ -1050,7 +1038,7 @@ LockedDesktopSettings::SetUIColors(BColorMap& colorSet,
bool moveData)
bool changed[colorSet.CountColors()];
fSettings->SetUIColors(colorSet, &changed[0]);
- DelayedMessage delayed(-1, AS_COLOR_SET_UPDATED, DM_MINIMUM_DELAY);
+ DelayedMessage delayed(-1, AS_COLOR_MAP_UPDATED, DM_MINIMUM_DELAY);
int32 count = fDesktop->GetAllWindowTargets(delayed);
if (count <= 0)
diff --git a/src/servers/app/DesktopSettings.h
b/src/servers/app/DesktopSettings.h
index 23e4fc7..6f0a2df 100644
--- a/src/servers/app/DesktopSettings.h
+++ b/src/servers/app/DesktopSettings.h
@@ -100,8 +100,6 @@ public:
void SetShowAllDraggers(bool
show);
- void SetUIColor(color_which
which,
- const
rgb_color color);
void SetUIColors(BColorMap&
colorSet,
bool
moveData);
diff --git a/src/servers/app/ProfileMessageSupport.cpp
b/src/servers/app/ProfileMessageSupport.cpp
index c118f46..f48f3bd 100644
--- a/src/servers/app/ProfileMessageSupport.cpp
+++ b/src/servers/app/ProfileMessageSupport.cpp
@@ -315,8 +315,7 @@ string_for_message_code(uint32 code, BString& string)
CODE(AS_DIRECT_WINDOW_SET_FULLSCREEN);
// Internal messages
- CODE(AS_COLOR_UPDATED);
- CODE(AS_COLOR_SET_UPDATED);
+ CODE(AS_COLOR_MAP_UPDATED);
default:
string << "unkown code: " << code;
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 46782d6..560c64a 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -1025,33 +1025,7 @@ ServerWindow::_DispatchMessage(int32 code,
BPrivate::LinkReceiver& link)
break;
}
- // TODO: remove fully?
- case AS_COLOR_UPDATED:
- {
- color_which which = B_NO_COLOR;
- if (link.Read<color_which>(&which) != B_OK
- || which == B_NO_COLOR)
- break;
-
- fDesktop->LockSingleWindow();
- DesktopSettings settings(fDesktop);
- rgb_color color = settings.UIColor(which);
- fDesktop->UnlockSingleWindow();
-
- fDesktop->ColorUpdated(fWindow, which, color);
-
- // send a delayed message to the client
- int32 intColor =
B_BENDIAN_TO_HOST_INT32(*(uint32*)&color);
-
- BMessage message(B_COLORS_UPDATED);
- message.AddInt32("_count", 1);
- message.AddInt32("_key", (int32)which);
- message.AddInt32("_color", intColor);
- SendMessageToClient(&message);
- break;
- }
-
- case AS_COLOR_SET_UPDATED:
+ case AS_COLOR_MAP_UPDATED:
{
BPrivate::BColorMapData* data = NULL;
@@ -3963,8 +3937,7 @@ ServerWindow::_MessageNeedsAllWindowsLocked(uint32 code)
const
// case AS_VIEW_SET_EVENT_MASK:
// case AS_VIEW_SET_MOUSE_EVENT_MASK:
case AS_TALK_TO_DESKTOP_LISTENER:
- case AS_COLOR_UPDATED:
- case AS_COLOR_SET_UPDATED:
+ case AS_COLOR_MAP_UPDATED:
return true;
default:
return false;
