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

BListView: Style fixes

Browse Source 
* Rename kDoubleClickTresh to kDoubleClickThreshold
  and use floating point in rval
* Pointer (*) goes with type for property var
* Use {}'s for multi-line if conditional
* rename point to where (consistent with header and rest of IK)
* Explicitly compare with 0 for bitwise operator statements
* Rename InitiateDrag() params
This commit is contained in:
John Scipione 2016-08-18 15:07:15 -07:00
parent 9c48b844fd
commit 9dfd244e92
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/os/interface/ListView.h
View File

@ -126,8 +126,8 @@ public:
virtual void SelectionChanged(); virtual void SelectionChanged();
virtual bool InitiateDrag(BPoint point, int32 itemIndex, virtual bool InitiateDrag(BPoint where, int32 index,
bool initialySelected); bool wasSelected);
void SortItems(int (*cmp)(const void*, void SortItems(int (*cmp)(const void*,
const void*)); const void*));

25
src/kits/interface/ListView.cpp
View File

@ -34,7 +34,7 @@ struct track_data {
}; };
const float kDoubleClickTresh = 6; const float kDoubleClickThreshold = 6.0f;
static property_info sProperties[] = { static property_info sProperties[] = {
@ -297,8 +297,9 @@ BListView::MessageReceived(BMessage* message)
const char* property; const char* property;
if (message->GetCurrentSpecifier(NULL, &specifier) != B_OK if (message->GetCurrentSpecifier(NULL, &specifier) != B_OK
|| specifier.FindString("property", &property) != B_OK) || specifier.FindString("property", &property) != B_OK) {
return; return;
}
switch (propInfo.FindMatch(message, 0, &specifier, message->what, switch (propInfo.FindMatch(message, 0, &specifier, message->what,
property)) { property)) {
@ -523,7 +524,7 @@ BListView::KeyDown(const char* bytes, int32 numBytes)
void void
BListView::MouseDown(BPoint point) BListView::MouseDown(BPoint where)
{ {
if (!IsFocus()) { if (!IsFocus()) {
MakeFocus(); MakeFocus();
@ -532,14 +533,14 @@ BListView::MouseDown(BPoint point)
} }
BMessage* message = Looper()->CurrentMessage(); BMessage* message = Looper()->CurrentMessage();
int32 index = IndexOf(point); int32 index = IndexOf(where);
// If the user double (or more) clicked within the current selection, // If the user double (or more) clicked within the current selection,
// we don't change the selection but invoke the selection. // we don't change the selection but invoke the selection.
// TODO: move this code someplace where it can be shared everywhere // TODO: move this code someplace where it can be shared everywhere
// instead of every class having to reimplement it, once some sane // instead of every class having to reimplement it, once some sane
// API for it is decided. // API for it is decided.
BPoint delta = point - fTrack->drag_start; BPoint delta = where - fTrack->drag_start;
bigtime_t sysTime; bigtime_t sysTime;
Window()->CurrentMessage()->FindInt64("when", &sysTime); Window()->CurrentMessage()->FindInt64("when", &sysTime);
bigtime_t timeDelta = sysTime - fTrack->last_click_time; bigtime_t timeDelta = sysTime - fTrack->last_click_time;
@ -548,8 +549,8 @@ BListView::MouseDown(BPoint point)
bool doubleClick = false; bool doubleClick = false;
if (timeDelta < doubleClickSpeed if (timeDelta < doubleClickSpeed
&& fabs(delta.x) < kDoubleClickTresh && fabs(delta.x) < kDoubleClickThreshold
&& fabs(delta.y) < kDoubleClickTresh && fabs(delta.y) < kDoubleClickThreshold
&& fTrack->item_index == index) { && fTrack->item_index == index) {
doubleClick = true; doubleClick = true;
} }
@ -564,7 +565,7 @@ BListView::MouseDown(BPoint point)
message->FindInt32("modifiers", &modifiers); message->FindInt32("modifiers", &modifiers);
if (!doubleClick) { if (!doubleClick) {
fTrack->drag_start = point; fTrack->drag_start = where;
fTrack->last_click_time = system_time(); fTrack->last_click_time = system_time();
fTrack->item_index = index; fTrack->item_index = index;
fTrack->was_selected = index >= 0 ? ItemAt(index)->IsSelected() : false; fTrack->was_selected = index >= 0 ? ItemAt(index)->IsSelected() : false;
@ -573,7 +574,7 @@ BListView::MouseDown(BPoint point)
if (index > -1) { if (index > -1) {
if (fListType == B_MULTIPLE_SELECTION_LIST) { if (fListType == B_MULTIPLE_SELECTION_LIST) {
if (modifiers & B_SHIFT_KEY) { if ((modifiers & B_SHIFT_KEY) != 0) {
// select entire block // select entire block
// TODO: maybe review if we want it like in Tracker // TODO: maybe review if we want it like in Tracker
// (anchor item) // (anchor item)
@ -586,7 +587,7 @@ BListView::MouseDown(BPoint point)
fLastSelected)); fLastSelected));
} }
} else { } else {
if (modifiers & B_COMMAND_KEY) { if ((modifiers & B_COMMAND_KEY) != 0) {
// toggle selection state of clicked item (like in Tracker) // toggle selection state of clicked item (like in Tracker)
// toggle selection state of clicked item // toggle selection state of clicked item
if (ItemAt(index)->IsSelected()) if (ItemAt(index)->IsSelected())
@ -598,7 +599,7 @@ BListView::MouseDown(BPoint point)
} }
} else { } else {
// toggle selection state of clicked item // toggle selection state of clicked item
if ((modifiers & B_COMMAND_KEY) && ItemAt(index)->IsSelected()) if ((modifiers & B_COMMAND_KEY) != 0 && ItemAt(index)->IsSelected())
Deselect(index); Deselect(index);
else else
Select(index); Select(index);
@ -636,7 +637,7 @@ BListView::MouseMoved(BPoint where, uint32 code, const BMessage* dragMessage)
bool bool
BListView::InitiateDrag(BPoint point, int32 index, bool wasSelected) BListView::InitiateDrag(BPoint where, int32 index, bool wasSelected)
{ {
return false; return false;
} }