Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some small style fixes

Browse Source
This commit is contained in:
John Scipione 2013-05-12 16:50:26 -04:00
parent 4346099683
commit c959ce4612
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/preferences/keymap/KeyboardLayoutView.cpp
View File

@ -345,8 +345,9 @@ KeyboardLayoutView::MouseMoved(BPoint point, uint32 transit,
int32 buttons;
if (Window()->CurrentMessage() == NULL
|| Window()->CurrentMessage()->FindInt32("buttons", &buttons) != B_OK
|| buttons == 0)
|| buttons == 0) {
return;
}
if (fDragKey == NULL && (fabs(point.x - fClickPoint.x) > 4
|| fabs(point.y - fClickPoint.y) > 4)) {
@ -505,8 +506,9 @@ KeyboardLayoutView::MessageReceived(BMessage* message)
// switch keys if the dropped object came from us
Key* key = _KeyForCode(keyCode);
if (key == NULL
|| (key == fDropTarget && fDragModifiers == fModifiers))
|| (key == fDropTarget && fDragModifiers == fModifiers)) {
return;
}
char* string;
int32 numBytes;
@ -1098,10 +1100,11 @@ KeyboardLayoutView::_KeyChanged(const BMessage* message)
const uint8* state;
ssize_t size;
int32 key;
if (message->FindData("states", B_UINT8_TYPE, (const void**)&state, &size)
!= B_OK
|| message->FindInt32("key", &key) != B_OK)
if (message->FindInt32("key", &key) != B_OK
|| message->FindData("states", B_UINT8_TYPE,
(const void**)&state, &size) != B_OK) {
return;
}
// Update key state, and invalidate change keys

3
src/preferences/keymap/KeymapWindow.cpp
View File

@ -947,7 +947,8 @@ KeymapWindow::_GetCurrentKeymap(entry_ref& ref)
BString
KeymapWindow::_GetActiveKeymapName()
{
BString mapName = kCurrentKeymapName; // safe default
BString mapName = kCurrentKeymapName;
// safe default
entry_ref ref;
_GetCurrentKeymap(ref);