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

Changes the menu key bitmap from CTL to CTRL and SHFT to SHIFT.

Browse Source 
This is coming from but does not close #7967

Adds a new (currently unused) Menu key bitmap.

Instead of having a single AltAsCommandKey() method the menus now
show the correct bitmap when you switch between your control,
windows/option, and alt/command keys. This is really not flushed
out yet since it only works when you switch those keys and not
other combinations like say switching the control and caps lock
keys but it is a step in the right direction.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43205 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
John Scipione
2011-11-07 01:46:42 +00:00
parent 3b8c2d3aad
commit 8abe72fb66
4 changed files with 236 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/interface/MenuPrivate.h
+22 -22
View File
@@ -34,39 +34,39 @@ public:
menu_layout Layout() const;
void ItemMarked(BMenuItem *item);
void CacheFontInfo();
void ItemMarked(BMenuItem *item);
void CacheFontInfo();
float FontHeight() const;
float Ascent() const;
BRect Padding() const;
void GetItemMargins(float *, float *, float *, float *) const;
float FontHeight() const;
float Ascent() const;
BRect Padding() const;
void GetItemMargins(float *, float *, float *, float *) const;
static bool IsAltCommandKey();
int State(BMenuItem **item = NULL) const;
int State(BMenuItem **item = NULL) const;
void Install(BWindow *window);
void Uninstall();
void SetSuper(BMenu *menu);
void SetSuperItem(BMenuItem *item);
void InvokeItem(BMenuItem *item, bool now = false);
void QuitTracking(bool thisMenuOnly = true);
void Install(BWindow *window);
void Uninstall();
void SetSuper(BMenu *menu);
void SetSuperItem(BMenuItem *item);
void InvokeItem(BMenuItem *item, bool now = false);
void QuitTracking(bool thisMenuOnly = true);
static status_t CreateBitmaps();
static void DeleteBitmaps();
static const BBitmap *MenuItemCommand();
static const BBitmap *MenuItemControl();
static const BBitmap *MenuItemOption();
static const BBitmap *MenuItemShift();
static const BBitmap *MenuItemShift();
static const BBitmap *MenuItemControl();
static const BBitmap *MenuItemOption();
static const BBitmap *MenuItemCommand();
static const BBitmap *MenuItemMenu();
private:
BMenu *fMenu;
BMenu *fMenu;
static BBitmap *sMenuItemAlt;
static BBitmap *sMenuItemShift;
static BBitmap *sMenuItemControl;
static BBitmap *sMenuItemOption;
static BBitmap *sMenuItemShift;
static BBitmap *sMenuItemAlt;
static BBitmap *sMenuItemMenu;
};