Set*UIColor, etc.
The inseparable changes necessary to support live color updating across the system in a sane, safe, and performant manner. BView gains: HasSystemColors() HasDefaultColors() AdoptSystemColors() AdoptParentColors() AdoptViewColor(BView*) SetViewUIColor(color_which, float tint) SetHighUIColor(... SetLowUIColor(... ViewUIColor(float* tint) HighUIColor(... LowUIColor(... DelayedInvalidate() BWindow gains a simple helper method: IsOffscreenWindow() BMessage gains: AddColor() FindColor() GetColor() HasColor() * allegedly this API is deprecated, but I implemented it anyway ReplaceColor() SetColor() Previous private ColorTools methods are made public and moved into GraphicsDefs: mix_color, blend_color, disable_color These are fully compatible with BeOS dan0 R5.1 methods and are just code cleanup of BeOS example code under the OpenTracker license. In addition, four new colors are created: B_LINK_TEXT_COLOR B_LINK_HOVER_COLOR B_LINK_ACTIVE_COLOR B_LINK_VISITED_COLOR These changes are documented in their proper user documentation files. In addition, due to a history rewrite, B_FOLLOW_LEFT_TOP has been defined and used in lieu of B_FOLLOW_TOP | B_FOLLOW_LEFT and is included in this commit. On the app_server side, the following has changed: Add DelayedMessage - a system by which messages can be sent at a scheduled time, and can also be merged according to set rules. A single thread is used to service the message queue and multiple recipients can be set for each message. Desktop gains the ability to add message ports to a DelayedMessage so that said messages can target either all applications or all windows, as needed. Desktop maintains a BMessage which is used to queue up all pending color changes and the delayed messaging system is used to enact these changes after a short period of time has passed. This prevents abuse and allows the system to merge repeated set_ui_color events into one event for client applications, improving performance drastically. In addition, B_COLORS_UPDATED is sent to the BApplication, which forwards the message to each BWindow. This is done to improve performance over having the app_server independently informing each window. Decorator changes are live now, which required some reworking. Signed-off-by: Augustin Cavalier <[email protected]>
This commit is contained in:
committed by
Augustin Cavalier
parent
a3212ce3e9
commit
7f9368cae5
@@ -1,11 +1,12 @@
|
||||
/*
|
||||
* Copyright 2005-2013, Haiku.
|
||||
* Copyright 2005-2015, Haiku.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Authors:
|
||||
* Stephan Aßmus <[email protected]>
|
||||
* Axel Dörfler, [email protected]
|
||||
* Andrej Spielmann, <[email protected]>
|
||||
* Joseph Groover <[email protected]>
|
||||
*/
|
||||
|
||||
|
||||
@@ -297,7 +298,10 @@ DesktopSettingsPrivate::_Load()
|
||||
snprintf(colorName, sizeof(colorName), "color%" B_PRId32,
|
||||
(int32)index_to_color_which(i));
|
||||
|
||||
settings.FindInt32(colorName, (int32*)&fShared.colors[i]);
|
||||
if (settings.FindInt32(colorName, (int32*)&fShared.colors[i]) != B_OK) {
|
||||
// Set obviously bad value so the Appearance app can detect it
|
||||
fShared.colors[i] = B_TRANSPARENT_COLOR;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -647,12 +651,16 @@ DesktopSettingsPrivate::WorkspacesMessage(int32 index) const
|
||||
|
||||
|
||||
void
|
||||
DesktopSettingsPrivate::SetUIColor(color_which which, const rgb_color color)
|
||||
DesktopSettingsPrivate::SetUIColor(color_which which, const rgb_color color,
|
||||
bool* changed)
|
||||
{
|
||||
int32 index = color_which_to_index(which);
|
||||
if (index < 0 || index >= kColorWhichCount)
|
||||
return;
|
||||
|
||||
if (changed != NULL)
|
||||
*changed = fShared.colors[index] != color;
|
||||
|
||||
fShared.colors[index] = color;
|
||||
// TODO: deprecate the background_color member of the menu_info struct,
|
||||
// otherwise we have to keep this duplication...
|
||||
@@ -663,6 +671,47 @@ DesktopSettingsPrivate::SetUIColor(color_which which, const rgb_color color)
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
DesktopSettingsPrivate::SetUIColors(const BMessage& colors, bool* changed)
|
||||
{
|
||||
int32 count = colors.CountNames(B_RGB_32_BIT_TYPE);
|
||||
if (count <= 0)
|
||||
return;
|
||||
|
||||
int32 index = 0;
|
||||
int32 colorIndex = 0;
|
||||
char* name = NULL;
|
||||
type_code type;
|
||||
rgb_color color;
|
||||
color_which which = B_NO_COLOR;
|
||||
|
||||
while (colors.GetInfo(B_RGB_32_BIT_TYPE, index, &name, &type) == B_OK) {
|
||||
which = which_ui_color(name);
|
||||
colorIndex = color_which_to_index(which);
|
||||
if (colorIndex < 0 || colorIndex >= kColorWhichCount
|
||||
|| colors.FindColor(name, &color) != B_OK) {
|
||||
if (changed != NULL)
|
||||
changed[index] = false;
|
||||
|
||||
++index;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (changed != NULL)
|
||||
changed[index] = fShared.colors[colorIndex] != color;
|
||||
|
||||
fShared.colors[colorIndex] = color;
|
||||
|
||||
if (which == (int32)B_MENU_BACKGROUND_COLOR)
|
||||
fMenuInfo.background_color = color;
|
||||
|
||||
++index;
|
||||
}
|
||||
|
||||
Save(kAppearanceSettings);
|
||||
}
|
||||
|
||||
|
||||
rgb_color
|
||||
DesktopSettingsPrivate::UIColor(color_which which) const
|
||||
{
|
||||
@@ -977,9 +1026,9 @@ LockedDesktopSettings::SetShowAllDraggers(bool show)
|
||||
|
||||
|
||||
void
|
||||
LockedDesktopSettings::SetUIColor(color_which which, const rgb_color color)
|
||||
LockedDesktopSettings::SetUIColors(const BMessage& colors, bool* changed)
|
||||
{
|
||||
fSettings->SetUIColor(which, color);
|
||||
fSettings->SetUIColors(colors, &changed[0]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user