i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/haiku/haiku

Browse Source
This commit is contained in:
Alex Wilson
2011-12-15 20:50:28 -07:00
parent 29ef6eb52d 09aaa658b0
commit a84e14ca84
4732 changed files with 115256 additions and 42332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/InterfaceDefs.h
+4 -1
View File
@@ -322,7 +322,10 @@ enum color_which {
B_WINDOW_TAB_COLOR = 3,
B_WINDOW_TEXT_COLOR = 22,
B_WINDOW_INACTIVE_TAB_COLOR = 23,
B_WINDOW_INACTIVE_TEXT_COLOR = 24
B_WINDOW_INACTIVE_TEXT_COLOR = 24,
B_WINDOW_BORDER_COLOR = 25,
B_WINDOW_INACTIVE_BORDER_COLOR = 26
};
headers/os/interface/Menu.h
+16 -2
View File
@@ -245,7 +245,14 @@ private:
void _SetIgnoreHidden(bool on);
void _SetStickyMode(bool on);
bool _IsStickyMode() const;
void _GetIsAltCommandKey(bool &value) const;
// Methods to get the current modifier keycode
void _GetShiftKey(uint32 &value) const;
void _GetControlKey(uint32 &value) const;
void _GetCommandKey(uint32 &value) const;
void _GetOptionKey(uint32 &value) const;
void _GetMenuKey(uint32 &value) const;
void _CalcTriggers();
bool _ChooseTrigger(const char* title, int32& index,
uint32& trigger,
@@ -262,7 +269,14 @@ private:
void _QuitTracking(bool onlyThis = true);
static menu_info sMenuInfo;
static bool sAltAsCommandKey;
// Variables to keep track of what code is currently assigned to
// each modifier key
static uint32 sShiftKey;
static uint32 sControlKey;
static uint32 sOptionKey;
static uint32 sCommandKey;
static uint32 sMenuKey;
BMenuItem* fChosenItem;
BList fItems;
headers/os/interface/Screen.h
+6 -6
View File
@@ -52,20 +52,20 @@ public:
BRect* frame = NULL);
rgb_color DesktopColor();
rgb_color DesktopColor(uint32 index);
rgb_color DesktopColor(uint32 workspace);
void SetDesktopColor(rgb_color color,
bool makeDefault = true);
bool stick = true);
void SetDesktopColor(rgb_color color,
uint32 index, bool makeDefault = true);
uint32 workspace, bool stick = true);
status_t ProposeMode(display_mode* target,
const display_mode* low,
const display_mode* high);
status_t GetModeList(display_mode** _modeList,
uint32* _count);
status_t GetMode(display_mode* _mode);
status_t GetMode(display_mode* mode);
status_t GetMode(uint32 workspace,
display_mode* _mode);
display_mode* mode);
status_t SetMode(display_mode* mode,
bool makeDefault = false);
status_t SetMode(uint32 workspace,
@@ -74,7 +74,7 @@ public:
status_t GetDeviceInfo(accelerant_device_info* info);
status_t GetMonitorInfo(monitor_info* info);
status_t GetPixelClockLimits(display_mode* mode,
uint32* low, uint32* high);
uint32* _low, uint32* _high);
status_t GetTimingConstraints(
display_timing_constraints*
timingConstraints);
headers/os/interface/SplitView.h
+5
View File
@@ -35,17 +35,22 @@ public:
float SplitterSize() const;
void SetSplitterSize(float size);
int32 CountItems() const;
float ItemWeight(int32 index) const;
float ItemWeight(BLayoutItem* item) const;
void SetItemWeight(int32 index, float weight,
bool invalidateLayout);
void SetItemWeight(BLayoutItem* item, float weight);
bool IsCollapsible(int32 index) const;
void SetCollapsible(bool collapsible);
void SetCollapsible(int32 index, bool collapsible);
void SetCollapsible(int32 first, int32 last,
bool collapsible);
bool IsItemCollapsed(int32 index) const;
void SetItemCollapsed(int32 index, bool collapsed);
// void AddChild(BView* child);
void AddChild(BView* child, BView* sibling = NULL);
bool AddChild(BView* child, float weight);