* There is now a server_read_only_memory structure that is placed in a (surprise!)
read-only area shared between the Desktop and all applications. * Right now, this area only contains the desktop colors, ie. B_PANEL_BACKGROUND_COLOR etc.; ui_color() no longer needs to ask the server for these colors. * The ui_colors are now maintained by DesktopSettings, though ColorSet is still there. * The default colors are now hardcoded once and for everyone in InterfaceDefs.h, ie. the app_server uses them as well. * Desktop::Init() can now also return an error (but that is not yet accounted for). * Cleaned up InterfaceDefs.h. * Fixed wrong include in moreUTF8.h. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17232 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -14,15 +14,18 @@
|
||||
#include "FontManager.h"
|
||||
#include "ServerConfig.h"
|
||||
|
||||
#include <DefaultColors.h>
|
||||
#include <ServerReadOnlyMemory.h>
|
||||
|
||||
#include <Directory.h>
|
||||
#include <File.h>
|
||||
#include <FindDirectory.h>
|
||||
//#include <DataIO./h>
|
||||
#include <Path.h>
|
||||
|
||||
|
||||
DesktopSettings::Private::Private()
|
||||
: BLocker("DesktopSettings_Private")
|
||||
DesktopSettings::Private::Private(server_read_only_memory* shared)
|
||||
: BLocker("DesktopSettings_Private"),
|
||||
fShared(*shared)
|
||||
{
|
||||
// if the on-disk settings are not complete, the defaults will be kept
|
||||
_SetDefaults();
|
||||
@@ -65,6 +68,8 @@ DesktopSettings::Private::_SetDefaults()
|
||||
fMenuInfo.triggers_always_shown = false;
|
||||
|
||||
fWorkspacesCount = 4;
|
||||
|
||||
memcpy(fShared.colors, BPrivate::kDefaultColors, sizeof(rgb_color) * kNumColors);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user