* Removed ColorSet, it's no longer needed or used.
* The Decorator are temporarily using ui_color() - this needs to be changed to use the DesktopSettings (when the decorator stuff gets refactored); right now, the colors are fixed. * Added B_WINDOW_TEXT_COLOR, B_WINDOW_INACTIVE_TAB_COLOR, and B_WINDOW_INACTIVE_TEXT_COLOR to the UI colors, B_WINDOW_TAB_COLOR is no longer deprecated. Note, however, that not every decorator may use these colors. * Removed unused and wrong (ie. hard-coded paths) stuff from ServerConfig.h. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17236 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -23,10 +23,11 @@ struct server_read_only_memory {
|
||||
static inline int32
|
||||
color_which_to_index(color_which which)
|
||||
{
|
||||
if (which <= B_TOOLTIP_TEXT_COLOR)
|
||||
// NOTE: this must be kept in sync with InterfaceDefs.h color_which!
|
||||
if (which <= B_WINDOW_INACTIVE_TEXT_COLOR)
|
||||
return which - 1;
|
||||
if (which >= B_SUCCESS_COLOR && which <= B_FAILURE_COLOR)
|
||||
return which - B_SUCCESS_COLOR + B_TOOLTIP_TEXT_COLOR;
|
||||
return which - B_SUCCESS_COLOR + B_WINDOW_INACTIVE_TEXT_COLOR;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user