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

* _UpdateButtons() was called too early, before fCurrentMap, and fAppliedMap

Browse Source 
were initialized, causing Keymap to lose the current map.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33808 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-10-28 12:03:04 +00:00
parent 7d6c7206c1
commit b10da4d8c7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/KeymapWindow.cpp
+3 -4
View File
@@ -108,8 +108,6 @@ KeymapWindow::KeymapWindow()
fKeyboardLayoutView->SetTarget(fTextControl->TextView()); fKeyboardLayoutView->SetTarget(fTextControl->TextView());
fTextControl->MakeFocus(); fTextControl->MakeFocus();
_UpdateButtons();
// Make sure the user keymap directory exists // Make sure the user keymap directory exists
BPath path; BPath path;
find_directory(B_USER_SETTINGS_DIRECTORY, &path); find_directory(B_USER_SETTINGS_DIRECTORY, &path);
@@ -119,9 +117,8 @@ KeymapWindow::KeymapWindow()
get_ref_for_path(path.Path(), &ref); get_ref_for_path(path.Path(), &ref);
BDirectory userKeymapsDir(&ref); BDirectory userKeymapsDir(&ref);
if (userKeymapsDir.InitCheck() != B_OK) { if (userKeymapsDir.InitCheck() != B_OK)
create_directory(path.Path(), S_IRWXU | S_IRWXG | S_IRWXO); create_directory(path.Path(), S_IRWXU | S_IRWXG | S_IRWXO);
}
BMessenger messenger(this); BMessenger messenger(this);
fOpenPanel = new BFilePanel(B_OPEN_PANEL, &messenger, &ref, fOpenPanel = new BFilePanel(B_OPEN_PANEL, &messenger, &ref,
@@ -154,6 +151,8 @@ KeymapWindow::KeymapWindow()
fAppliedMap = fCurrentMap; fAppliedMap = fCurrentMap;
fCurrentMap.SetTarget(this, new BMessage(kMsgKeymapUpdated)); fCurrentMap.SetTarget(this, new BMessage(kMsgKeymapUpdated));
_UpdateButtons();
_UpdateDeadKeyMenu(); _UpdateDeadKeyMenu();
_UpdateSwitchShortcutButton(); _UpdateSwitchShortcutButton();