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

Tracker: style fixes to InfoWindow

Browse Source 
Return B_BAD_VALUE if pointer is NULL in InfoWindow
This commit is contained in:
John Scipione
2014-06-20 21:01:55 -04:00
parent ba50b2c229
commit ff43bcbfd5
2 changed files with 214 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/InfoWindow.cpp
+184 -173
View File
@@ -89,106 +89,110 @@ enum track_state {
path_track, path_track,
icon_track, icon_track,
size_track, size_track,
open_only_track // This is for items that can be opened, but can't be open_only_track
// drag and dropped or renamed (Trash, Desktop Folder...) // This is for items that can be opened, but can't be
// drag and dropped or renamed (Trash, Desktop Folder...)
}; };
class TrackingView : public BControl { class TrackingView : public BControl {
public: public:
TrackingView(BRect, const char* str, BMessage* message); TrackingView(BRect, const char* str, BMessage* message);
virtual void MouseDown(BPoint); virtual void MouseDown(BPoint);
virtual void MouseMoved(BPoint, uint32 transit, const BMessage* message); virtual void MouseMoved(BPoint where, uint32 transit, const BMessage*);
virtual void MouseUp(BPoint); virtual void MouseUp(BPoint);
virtual void Draw(BRect); virtual void Draw(BRect);
private: private:
bool fMouseDown; bool fMouseDown;
bool fMouseInView; bool fMouseInView;
}; };
class AttributeView : public BView { class AttributeView : public BView {
public: public:
AttributeView(BRect, Model*); AttributeView(BRect, Model*);
~AttributeView(); ~AttributeView();
void ModelChanged(Model*, BMessage*); void ModelChanged(Model*, BMessage*);
void ReLinkTargetModel(Model*); void ReLinkTargetModel(Model*);
void BeginEditingTitle(); void BeginEditingTitle();
void FinishEditingTitle(bool); void FinishEditingTitle(bool);
float CurrentFontHeight(float size = -1); float CurrentFontHeight(float size = -1);
BTextView* TextView() const { return fTitleEditView; } BTextView* TextView() const { return fTitleEditView; }
static filter_result TextViewFilter(BMessage*, BHandler**, static filter_result TextViewFilter(BMessage*, BHandler**,
BMessageFilter*); BMessageFilter*);
off_t LastSize() const; off_t LastSize() const;
void SetLastSize(off_t); void SetLastSize(off_t);
void SetSizeStr(const char*); void SetSizeString(const char*);
status_t BuildContextMenu(BMenu* parent); status_t BuildContextMenu(BMenu* parent);
void SetPermissionsSwitchState(int32 state); void SetPermissionsSwitchState(int32 state);
protected: protected:
virtual void MouseDown(BPoint); virtual void MouseDown(BPoint where);
virtual void MouseMoved(BPoint, uint32, const BMessage*); virtual void MouseMoved(BPoint where, uint32, const BMessage* dragMessage);
virtual void MouseUp(BPoint); virtual void MouseUp(BPoint where);
virtual void MessageReceived(BMessage*); virtual void MessageReceived(BMessage* message);
virtual void AttachedToWindow(); virtual void AttachedToWindow();
virtual void Draw(BRect); virtual void Draw(BRect);
virtual void Pulse(); virtual void Pulse();
virtual void MakeFocus(bool); virtual void MakeFocus(bool focus);
virtual void WindowActivated(bool); virtual void WindowActivated(bool active);
private: private:
void InitStrings(const Model*); void InitStrings(const Model*);
void CheckAndSetSize(); void CheckAndSetSize();
void OpenLinkSource(); void OpenLinkSource();
void OpenLinkTarget(); void OpenLinkTarget();
BString fPathStr; BString fPathStr;
BString fLinkToStr; BString fLinkToStr;
BString fSizeStr; BString fSizeString;
BString fModifiedStr; BString fModifiedStr;
BString fCreatedStr; BString fCreatedStr;
BString fKindStr; BString fKindStr;
BString fDescStr; BString fDescStr;
off_t fFreeBytes; off_t fFreeBytes;
off_t fLastSize; off_t fLastSize;
BRect fPathRect; BRect fPathRect;
BRect fLinkRect; BRect fLinkRect;
BRect fDescRect; BRect fDescRect;
BRect fTitleRect; BRect fTitleRect;
BRect fIconRect; BRect fIconRect;
BRect fSizeRect; BRect fSizeRect;
BPoint fClickPoint; BPoint fClickPoint;
float fDivider; float fDivider;
BMenuField* fPreferredAppMenu; BMenuField* fPreferredAppMenu;
Model* fModel; Model* fModel;
Model* fIconModel; Model* fIconModel;
BBitmap* fIcon; BBitmap* fIcon;
bool fMouseDown; bool fMouseDown;
bool fDragging; bool fDragging;
bool fDoubleClick; bool fDoubleClick;
track_state fTrackingState; track_state fTrackingState;
bool fIsDropTarget; bool fIsDropTarget;
BTextView* fTitleEditView; BTextView* fTitleEditView;
PaneSwitch* fPermissionsSwitch; PaneSwitch* fPermissionsSwitch;
BWindow* fPathWindow; BWindow* fPathWindow;
BWindow* fLinkWindow; BWindow* fLinkWindow;
BWindow* fDescWindow; BWindow* fDescWindow;
typedef BView _inherited; typedef BView _inherited;
}; };
} // namespace BPrivate } // namespace BPrivate
const float kDrawMargin = 3.0f; const float kDrawMargin = 3.0f;
const float kBorderMargin = 15.0f; const float kBorderMargin = 15.0f;
const float kBorderWidth = 32.0f; const float kBorderWidth = 32.0f;
@@ -281,7 +285,8 @@ OpenToolTipWindow(BScreen& screen, BRect rect, const char* name,
BInfoWindow::BInfoWindow(Model* model, int32 group_index, BInfoWindow::BInfoWindow(Model* model, int32 group_index,
LockingList<BWindow>* list) LockingList<BWindow>* list)
: BWindow(BInfoWindow::InfoWindowRect(false), :
BWindow(BInfoWindow::InfoWindowRect(false),
"InfoWindow", B_TITLED_WINDOW, "InfoWindow", B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_NOT_ZOOMABLE, B_CURRENT_WORKSPACE), B_NOT_RESIZABLE | B_NOT_ZOOMABLE, B_CURRENT_WORKSPACE),
fModel(model), fModel(model),
@@ -293,7 +298,8 @@ BInfoWindow::BInfoWindow(Model* model, int32 group_index,
fFilePanel(NULL), fFilePanel(NULL),
fFilePanelOpen(false) fFilePanelOpen(false)
{ {
SetPulseRate(1000000); // we use pulse to check freebytes on volume SetPulseRate(1000000);
// we use pulse to check freebytes on volume
TTracker::WatchNode(model->NodeRef(), B_WATCH_ALL | B_WATCH_MOUNT, this); TTracker::WatchNode(model->NodeRef(), B_WATCH_ALL | B_WATCH_MOUNT, this);
@@ -389,7 +395,7 @@ BInfoWindow::Show()
if (!TargetModel()->IsVolume() && !TargetModel()->IsRoot()) { if (!TargetModel()->IsVolume() && !TargetModel()->IsRoot()) {
if (TargetModel()->IsDirectory()) { if (TargetModel()->IsDirectory()) {
// if this is a folder then spawn thread to calculate size // if this is a folder then spawn thread to calculate size
SetSizeStr(B_TRANSLATE("calculating" B_UTF8_ELLIPSIS)); SetSizeString(B_TRANSLATE("calculating" B_UTF8_ELLIPSIS));
fCalcThreadID = spawn_thread(BInfoWindow::CalcSize, "CalcSize", fCalcThreadID = spawn_thread(BInfoWindow::CalcSize, "CalcSize",
B_NORMAL_PRIORITY, this); B_NORMAL_PRIORITY, this);
resume_thread(fCalcThreadID); resume_thread(fCalcThreadID);
@@ -398,7 +404,7 @@ BInfoWindow::Show()
BString sizeStr; BString sizeStr;
GetSizeString(sizeStr, fAttributeView->LastSize(), 0); GetSizeString(sizeStr, fAttributeView->LastSize(), 0);
SetSizeStr(sizeStr.String()); SetSizeString(sizeStr.String());
} }
} }
@@ -470,7 +476,7 @@ BInfoWindow::MessageReceived(BMessage* message)
// Start recalculating.. // Start recalculating..
fStopCalc = false; fStopCalc = false;
SetSizeStr(B_TRANSLATE("calculating" B_UTF8_ELLIPSIS)); SetSizeString(B_TRANSLATE("calculating" B_UTF8_ELLIPSIS));
fCalcThreadID = spawn_thread(BInfoWindow::CalcSize, "CalcSize", fCalcThreadID = spawn_thread(BInfoWindow::CalcSize, "CalcSize",
B_NORMAL_PRIORITY, this); B_NORMAL_PRIORITY, this);
resume_thread(fCalcThreadID); resume_thread(fCalcThreadID);
@@ -487,8 +493,8 @@ BInfoWindow::MessageReceived(BMessage* message)
if (!fModel->IsSymLink()) if (!fModel->IsSymLink())
break; break;
// supposed to fall through // supposed to fall through
// An item was selected from the file panel // An item was selected from the file panel
// fall-through
case kNewTargetSelected: case kNewTargetSelected:
{ {
// Extract the BEntry, and set its full path to the string value // Extract the BEntry, and set its full path to the string value
@@ -615,19 +621,16 @@ BInfoWindow::MessageReceived(BMessage* message)
break; break;
case B_DEVICE_UNMOUNTED: case B_DEVICE_UNMOUNTED:
{ {
// We were watching a volume that is no longer // We were watching a volume that is no longer
// mounted, we might as well quit // mounted, we might as well quit
node_ref itemNode; node_ref itemNode;
// Only the device information is available // Only the device information is available
message->FindInt32("device", &itemNode.device); message->FindInt32("device", &itemNode.device);
if (TargetModel()->NodeRef()->device if (TargetModel()->NodeRef()->device == itemNode.device)
== itemNode.device) { Close();
Close(); break;
} }
break;
}
default: default:
break; break;
@@ -725,7 +728,7 @@ BInfoWindow::CalcSize(void* castToWindow)
if (!lock) if (!lock)
return B_ERROR; return B_ERROR;
window->SetSizeStr(B_TRANSLATE("Error calculating folder size.")); window->SetSizeString(B_TRANSLATE("Error calculating folder size."));
return B_ERROR; return B_ERROR;
} }
@@ -747,8 +750,7 @@ BInfoWindow::CalcSize(void* castToWindow)
// got the size value, update the size string // got the size value, update the size string
GetSizeString(sizeString, size, fileCount); GetSizeString(sizeString, size, fileCount);
} } else {
else {
// in the trash case, iterate through and sum up // in the trash case, iterate through and sum up
// size/counts for all present trash dirs // size/counts for all present trash dirs
off_t totalSize = 0, currentSize; off_t totalSize = 0, currentSize;
@@ -785,19 +787,19 @@ BInfoWindow::CalcSize(void* castToWindow)
AutoLock<BWindow> lock(window); AutoLock<BWindow> lock(window);
if (lock.IsLocked()) if (lock.IsLocked())
window->SetSizeStr(sizeString.String()); window->SetSizeString(sizeString.String());
return B_OK; return B_OK;
} }
void void
BInfoWindow::SetSizeStr(const char* sizeStr) BInfoWindow::SetSizeString(const char* sizeString)
{ {
AttributeView* view AttributeView* view
= dynamic_cast<AttributeView *>(FindView("attr_view")); = dynamic_cast<AttributeView*>(FindView("attr_view"));
if (view) if (view != NULL)
view->SetSizeStr(sizeStr); view->SetSizeString(sizeString);
} }
@@ -834,11 +836,12 @@ BInfoWindow::OpenFilePanel(const entry_ref* ref)
} }
// #pragma mark - // #pragma mark - AttributeView
AttributeView::AttributeView(BRect rect, Model* model) AttributeView::AttributeView(BRect rect, Model* model)
: BView(rect, "attr_view", B_FOLLOW_ALL_SIDES, :
BView(rect, "attr_view", B_FOLLOW_ALL_SIDES,
B_WILL_DRAW | B_PULSE_NEEDED), B_WILL_DRAW | B_PULSE_NEEDED),
fDivider(0), fDivider(0),
fPreferredAppMenu(NULL), fPreferredAppMenu(NULL),
@@ -897,7 +900,7 @@ AttributeView::AttributeView(BRect rect, Model* model)
fTitleRect.InsetBy(-1, -2); fTitleRect.InsetBy(-1, -2);
fFreeBytes = -1; fFreeBytes = -1;
fSizeStr = ""; fSizeString = "";
fSizeRect.Set(0, 0, 0, 0); fSizeRect.Set(0, 0, 0, 0);
// Find offset for attributes, might be overiden below if there // Find offset for attributes, might be overiden below if there
@@ -1052,8 +1055,10 @@ AttributeView::InitStrings(const Model* model)
char linkToPath[B_PATH_NAME_LENGTH]; char linkToPath[B_PATH_NAME_LENGTH];
symLink.ReadLink(linkToPath, B_PATH_NAME_LENGTH); symLink.ReadLink(linkToPath, B_PATH_NAME_LENGTH);
fLinkToStr = linkToPath; fLinkToStr = linkToPath;
if (!linked) if (!linked) {
fLinkToStr += " (broken)"; // link points to missing object // link points to missing object
fLinkToStr += " (broken)";
}
} else if (model->IsExecutable()) { } else if (model->IsExecutable()) {
if (((Model*)model)->GetLongVersionString(fDescStr, if (((Model*)model)->GetLongVersionString(fDescStr,
B_APP_VERSION_KIND) == B_OK) { B_APP_VERSION_KIND) == B_OK) {
@@ -1149,8 +1154,8 @@ AttributeView::ModelChanged(Model* model, BMessage* message)
// don't change the size if it's a directory // don't change the size if it's a directory
if (!model->IsDirectory()) { if (!model->IsDirectory()) {
fLastSize = model->StatBuf()->st_size; fLastSize = model->StatBuf()->st_size;
fSizeStr = ""; fSizeString = "";
BInfoWindow::GetSizeString(fSizeStr, fLastSize, 0); BInfoWindow::GetSizeString(fSizeString, fLastSize, 0);
} }
model->CloseNode(); model->CloseNode();
} }
@@ -1238,7 +1243,7 @@ AttributeView::ReLinkTargetModel(Model* model)
void void
AttributeView::MouseDown(BPoint point) AttributeView::MouseDown(BPoint where)
{ {
BEntry entry; BEntry entry;
fModel->GetEntry(&entry); fModel->GetEntry(&entry);
@@ -1247,13 +1252,13 @@ AttributeView::MouseDown(BPoint point)
fDoubleClick = false; fDoubleClick = false;
// Start tracking the mouse if we are in any of the hotspots // Start tracking the mouse if we are in any of the hotspots
if (fLinkRect.Contains(point)) { if (fLinkRect.Contains(where)) {
InvertRect(fLinkRect); InvertRect(fLinkRect);
fTrackingState = link_track; fTrackingState = link_track;
} else if (fPathRect.Contains(point)) { } else if (fPathRect.Contains(where)) {
InvertRect(fPathRect); InvertRect(fPathRect);
fTrackingState = path_track; fTrackingState = path_track;
} else if (fTitleRect.Contains(point)) { } else if (fTitleRect.Contains(where)) {
if (!fModel->HasLocalizedName() if (!fModel->HasLocalizedName()
&& ConfirmChangeIfWellKnownDirectory(&entry, && ConfirmChangeIfWellKnownDirectory(&entry,
B_TRANSLATE_COMMENT("rename", B_TRANSLATE_COMMENT("rename",
@@ -1268,14 +1273,14 @@ AttributeView::MouseDown(BPoint point)
BeginEditingTitle(); BeginEditingTitle();
} else if (fTitleEditView) { } else if (fTitleEditView) {
FinishEditingTitle(true); FinishEditingTitle(true);
} else if (fSizeRect.Contains(point)) { } else if (fSizeRect.Contains(where)) {
if (fModel->IsDirectory() && !fModel->IsVolume() if (fModel->IsDirectory() && !fModel->IsVolume()
&& !fModel->IsRoot()) { && !fModel->IsRoot()) {
InvertRect(fSizeRect); InvertRect(fSizeRect);
fTrackingState = size_track; fTrackingState = size_track;
} else } else
fTrackingState = no_track; fTrackingState = no_track;
} else if (fIconRect.Contains(point)) { } else if (fIconRect.Contains(where)) {
uint32 buttons; uint32 buttons;
Window()->CurrentMessage()->FindInt32("buttons", (int32*)&buttons); Window()->CurrentMessage()->FindInt32("buttons", (int32*)&buttons);
if (SecondaryMouseButtonDown(modifiers(), buttons)) { if (SecondaryMouseButtonDown(modifiers(), buttons)) {
@@ -1285,7 +1290,7 @@ AttributeView::MouseDown(BPoint point)
if (contextMenu) { if (contextMenu) {
BuildContextMenu(contextMenu); BuildContextMenu(contextMenu);
contextMenu->SetAsyncAutoDestruct(true); contextMenu->SetAsyncAutoDestruct(true);
contextMenu->Go(ConvertToScreen(point), true, true, contextMenu->Go(ConvertToScreen(where), true, true,
ConvertToScreen(fIconRect)); ConvertToScreen(fIconRect));
} }
} else { } else {
@@ -1293,8 +1298,8 @@ AttributeView::MouseDown(BPoint point)
// versus just in the container rect. The icons are always // versus just in the container rect. The icons are always
// the large version // the large version
BPoint offsetPoint; BPoint offsetPoint;
offsetPoint.x = point.x - fIconRect.left; offsetPoint.x = where.x - fIconRect.left;
offsetPoint.y = point.y - fIconRect.top; offsetPoint.y = where.y - fIconRect.top;
if (IconCache::sIconCache->IconHitTest(offsetPoint, fIconModel, if (IconCache::sIconCache->IconHitTest(offsetPoint, fIconModel,
kNormalIcon, B_LARGE_ICON)) { kNormalIcon, B_LARGE_ICON)) {
// Can't drag the trash anywhere.. // Can't drag the trash anywhere..
@@ -1302,8 +1307,8 @@ AttributeView::MouseDown(BPoint point)
? open_only_track : icon_track; ? open_only_track : icon_track;
// Check for possible double click // Check for possible double click
if (abs((int32)(fClickPoint.x - point.x)) < kDragSlop if (abs((int32)(fClickPoint.x - where.x)) < kDragSlop
&& abs((int32)(fClickPoint.y - point.y)) < kDragSlop) { && abs((int32)(fClickPoint.y - where.y)) < kDragSlop) {
int32 clickCount; int32 clickCount;
Window()->CurrentMessage()->FindInt32("clicks", Window()->CurrentMessage()->FindInt32("clicks",
&clickCount); &clickCount);
@@ -1320,21 +1325,22 @@ AttributeView::MouseDown(BPoint point)
} }
} }
} }
fClickPoint = point;
fClickPoint = where;
fMouseDown = true; fMouseDown = true;
SetMouseEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY); SetMouseEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
} }
void void
AttributeView::MouseMoved(BPoint point, uint32, const BMessage* message) AttributeView::MouseMoved(BPoint where, uint32, const BMessage* dragMessage)
{ {
// Highlight Drag target if (dragMessage != NULL && dragMessage->ReturnAddress() != BMessenger(this)
if (message && message->ReturnAddress() != BMessenger(this) && dragMessage->what == B_SIMPLE_DATA
&& message->what == B_SIMPLE_DATA && BPoseView::CanHandleDragSelection(fModel, dragMessage,
&& BPoseView::CanHandleDragSelection(fModel, message,
(modifiers() & B_CONTROL_KEY) != 0)) { (modifiers() & B_CONTROL_KEY) != 0)) {
bool overTarget = fIconRect.Contains(point); // highlight drag target
bool overTarget = fIconRect.Contains(where);
SetDrawingMode(B_OP_OVER); SetDrawingMode(B_OP_OVER);
if (overTarget != fIsDropTarget) { if (overTarget != fIsDropTarget) {
IconCache::sIconCache->Draw(fIconModel, this, fIconRect.LeftTop(), IconCache::sIconCache->Draw(fIconModel, this, fIconRect.LeftTop(),
@@ -1345,21 +1351,21 @@ AttributeView::MouseMoved(BPoint point, uint32, const BMessage* message)
switch (fTrackingState) { switch (fTrackingState) {
case link_track: case link_track:
if (fLinkRect.Contains(point) != fMouseDown) { if (fLinkRect.Contains(where) != fMouseDown) {
fMouseDown = !fMouseDown; fMouseDown = !fMouseDown;
InvertRect(fLinkRect); InvertRect(fLinkRect);
} }
break; break;
case path_track: case path_track:
if (fPathRect.Contains(point) != fMouseDown) { if (fPathRect.Contains(where) != fMouseDown) {
fMouseDown = !fMouseDown; fMouseDown = !fMouseDown;
InvertRect(fPathRect); InvertRect(fPathRect);
} }
break; break;
case size_track: case size_track:
if (fSizeRect.Contains(point) != fMouseDown) { if (fSizeRect.Contains(where) != fMouseDown) {
fMouseDown = !fMouseDown; fMouseDown = !fMouseDown;
InvertRect(fSizeRect); InvertRect(fSizeRect);
} }
@@ -1367,8 +1373,8 @@ AttributeView::MouseMoved(BPoint point, uint32, const BMessage* message)
case icon_track: case icon_track:
if (fMouseDown && !fDragging if (fMouseDown && !fDragging
&& (abs((int32)(point.x - fClickPoint.x)) > kDragSlop && (abs((int32)(where.x - fClickPoint.x)) > kDragSlop
|| abs((int32)(point.y - fClickPoint.y)) > kDragSlop)) { || abs((int32)(where.y - fClickPoint.y)) > kDragSlop)) {
// Find the required height // Find the required height
BFont font; BFont font;
GetFont(&font); GetFont(&font);
@@ -1422,19 +1428,19 @@ AttributeView::MouseMoved(BPoint point, uint32, const BMessage* message)
view->Sync(); view->Sync();
dragBitmap->Unlock(); dragBitmap->Unlock();
BMessage message(B_REFS_RECEIVED); BMessage dragMessage(B_REFS_RECEIVED);
message.AddPoint("click_pt", fClickPoint); dragMessage.AddPoint("click_pt", fClickPoint);
BPoint tmpLoc; BPoint tmpLoc;
uint32 button; uint32 button;
GetMouse(&tmpLoc, &button); GetMouse(&tmpLoc, &button);
if (button) if (button)
message.AddInt32("buttons", (int32)button); dragMessage.AddInt32("buttons", (int32)button);
message.AddInt32("be:actions", dragMessage.AddInt32("be:actions",
(modifiers() & B_OPTION_KEY) != 0 (modifiers() & B_OPTION_KEY) != 0
? B_COPY_TARGET : B_MOVE_TARGET); ? B_COPY_TARGET : B_MOVE_TARGET);
message.AddRef("refs", fModel->EntryRef()); dragMessage.AddRef("refs", fModel->EntryRef());
DragMessage(&message, dragBitmap, B_OP_ALPHA, DragMessage(&dragMessage, dragBitmap, B_OP_ALPHA,
BPoint((fClickPoint.x - fIconRect.left) BPoint((fClickPoint.x - fIconRect.left)
+ hIconOffset, fClickPoint.y - fIconRect.top), this); + hIconOffset, fClickPoint.y - fIconRect.top), this);
fDragging = true; fDragging = true;
@@ -1552,18 +1558,18 @@ AttributeView::OpenLinkTarget()
void void
AttributeView::MouseUp(BPoint point) AttributeView::MouseUp(BPoint where)
{ {
// Are we in the link rect? // Are we in the link rect?
if (fTrackingState == link_track && fLinkRect.Contains(point)) { if (fTrackingState == link_track && fLinkRect.Contains(where)) {
InvertRect(fLinkRect); InvertRect(fLinkRect);
OpenLinkTarget(); OpenLinkTarget();
} else if (fTrackingState == path_track && fPathRect.Contains(point)) { } else if (fTrackingState == path_track && fPathRect.Contains(where)) {
InvertRect(fPathRect); InvertRect(fPathRect);
OpenLinkSource(); OpenLinkSource();
} else if ((fTrackingState == icon_track } else if ((fTrackingState == icon_track
|| fTrackingState == open_only_track) || fTrackingState == open_only_track)
&& fIconRect.Contains(point)) { && fIconRect.Contains(where)) {
// If it was a double click, then tell Tracker to open the item // If it was a double click, then tell Tracker to open the item
// The CurrentMessage() here does* not* have a "clicks" field, // The CurrentMessage() here does* not* have a "clicks" field,
// which is why we are tracking the clicks with this temp var // which is why we are tracking the clicks with this temp var
@@ -1578,7 +1584,7 @@ AttributeView::MouseUp(BPoint point)
be_app->PostMessage(&message); be_app->PostMessage(&message);
fDoubleClick = false; fDoubleClick = false;
} }
} else if (fTrackingState == size_track && fSizeRect.Contains(point)) { } else if (fTrackingState == size_track && fSizeRect.Contains(where)) {
// Recalculate size // Recalculate size
Window()->PostMessage(kRecalculateSize); Window()->PostMessage(kRecalculateSize);
} }
@@ -1617,15 +1623,15 @@ AttributeView::CheckAndSetSize()
fFreeBytes = freeBytes; fFreeBytes = freeBytes;
fSizeStr.SetTo(B_TRANSLATE("%capacity (%used used -- %free free)")); fSizeString.SetTo(B_TRANSLATE("%capacity (%used used -- %free free)"));
char sizeStr[128]; char sizeStr[128];
string_for_size(capacity, sizeStr, sizeof(sizeStr)); string_for_size(capacity, sizeStr, sizeof(sizeStr));
fSizeStr.ReplaceFirst("%capacity", sizeStr); fSizeString.ReplaceFirst("%capacity", sizeStr);
string_for_size(capacity - fFreeBytes, sizeStr, sizeof(sizeStr)); string_for_size(capacity - fFreeBytes, sizeStr, sizeof(sizeStr));
fSizeStr.ReplaceFirst("%used", sizeStr); fSizeString.ReplaceFirst("%used", sizeStr);
string_for_size(fFreeBytes, sizeStr, sizeof(sizeStr)); string_for_size(fFreeBytes, sizeStr, sizeof(sizeStr));
fSizeStr.ReplaceFirst("%free", sizeStr); fSizeString.ReplaceFirst("%free", sizeStr);
} else if (fModel->IsFile()) { } else if (fModel->IsFile()) {
// poll for size changes because they do not get node monitored // poll for size changes because they do not get node monitored
@@ -1642,8 +1648,8 @@ AttributeView::CheckAndSetSize()
return; return;
fLastSize = statBuf.st_size; fLastSize = statBuf.st_size;
fSizeStr = ""; fSizeString = "";
BInfoWindow::GetSizeString(fSizeStr, fLastSize, 0); BInfoWindow::GetSizeString(fSizeString, fLastSize, 0);
} else } else
return; return;
@@ -1695,12 +1701,13 @@ AttributeView::MessageReceived(BMessage* message)
default: default:
_inherited::MessageReceived(message); _inherited::MessageReceived(message);
break;
} }
} }
void void
AttributeView::Draw(BRect updateRect) AttributeView::Draw(BRect)
{ {
// Set the low color for anti-aliasing // Set the low color for anti-aliasing
SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -1777,17 +1784,17 @@ AttributeView::Draw(BRect updateRect)
MovePenTo(BPoint(fDivider + kDrawMargin, lineBase)); MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
SetHighColor(kAttrValueColor); SetHighColor(kAttrValueColor);
// Check for possible need of truncation // Check for possible need of truncation
if (StringWidth(fSizeStr.String()) if (StringWidth(fSizeString.String())
> (Bounds().Width() - (fDivider + kBorderMargin))) { > (Bounds().Width() - (fDivider + kBorderMargin))) {
BString tmpString(fSizeStr.String()); BString tmpString(fSizeString.String());
TruncateString(&tmpString, B_TRUNCATE_MIDDLE, TruncateString(&tmpString, B_TRUNCATE_MIDDLE,
Bounds().Width() - (fDivider + kBorderMargin)); Bounds().Width() - (fDivider + kBorderMargin));
DrawString(tmpString.String()); DrawString(tmpString.String());
fSizeRect.right = fSizeRect.left + StringWidth(tmpString.String()) fSizeRect.right = fSizeRect.left + StringWidth(tmpString.String())
+ 3; + 3;
} else { } else {
DrawString(fSizeStr.String()); DrawString(fSizeString.String());
fSizeRect.right = fSizeRect.left + StringWidth(fSizeStr.String()) + 3; fSizeRect.right = fSizeRect.left + StringWidth(fSizeString.String()) + 3;
} }
lineBase += lineHeight; lineBase += lineHeight;
@@ -2032,34 +2039,35 @@ AttributeView::FinishEditingTitle(bool commit)
void void
AttributeView::MakeFocus(bool isFocus) AttributeView::MakeFocus(bool focus)
{ {
if (!isFocus && fTitleEditView != NULL) if (!focus && fTitleEditView != NULL)
FinishEditingTitle(true); FinishEditingTitle(true);
} }
void void
AttributeView::WindowActivated(bool isFocus) AttributeView::WindowActivated(bool active)
{ {
if (!isFocus) { if (active)
if (fTitleEditView != NULL) return;
FinishEditingTitle(true);
if (fPathWindow->Lock()) { if (fTitleEditView != NULL)
fPathWindow->Quit(); FinishEditingTitle(true);
fPathWindow = NULL;
}
if (fLinkWindow->Lock()) { if (fPathWindow->Lock()) {
fLinkWindow->Quit(); fPathWindow->Quit();
fLinkWindow = NULL; fPathWindow = NULL;
} }
if (fDescWindow->Lock()) { if (fLinkWindow->Lock()) {
fDescWindow->Quit(); fLinkWindow->Quit();
fDescWindow = NULL; fLinkWindow = NULL;
} }
if (fDescWindow->Lock()) {
fDescWindow->Quit();
fDescWindow = NULL;
} }
} }
@@ -2082,6 +2090,9 @@ AttributeView::CurrentFontHeight(float size)
status_t status_t
AttributeView::BuildContextMenu(BMenu* parent) AttributeView::BuildContextMenu(BMenu* parent)
{ {
if (parent == NULL)
return B_BAD_VALUE;
// Add navigation menu if this is not a symlink // Add navigation menu if this is not a symlink
// Symlink's to directories are OK however! // Symlink's to directories are OK however!
BEntry entry(fModel->EntryRef()); BEntry entry(fModel->EntryRef());
@@ -2231,9 +2242,9 @@ AttributeView::SetLastSize(off_t lastSize)
void void
AttributeView::SetSizeStr(const char* sizeStr) AttributeView::SetSizeString(const char* sizeString)
{ {
fSizeStr = sizeStr; fSizeString = sizeString;
BRect bounds(Bounds()); BRect bounds(Bounds());
float lineHeight = CurrentFontHeight(kAttribFontHeight) + 6; float lineHeight = CurrentFontHeight(kAttribFontHeight) + 6;
src/kits/tracker/InfoWindow.h
+30 -29
View File
@@ -54,41 +54,41 @@ class AttributeView;
class BInfoWindow : public BWindow { class BInfoWindow : public BWindow {
public: public:
BInfoWindow(Model*, int32 groupIndex, BInfoWindow(Model*, int32 groupIndex,
LockingList<BWindow>* list = NULL); LockingList<BWindow>* list = NULL);
~BInfoWindow(); ~BInfoWindow();
virtual bool IsShowing(const node_ref*) const; virtual bool IsShowing(const node_ref*) const;
Model* TargetModel() const; Model* TargetModel() const;
void SetSizeStr(const char*); void SetSizeString(const char*);
bool StopCalc(); bool StopCalc();
void OpenFilePanel(const entry_ref*); void OpenFilePanel(const entry_ref*);
static void GetSizeString(BString &result, off_t size, static void GetSizeString(BString &result, off_t size,
int32 fileCount); int32 fileCount);
protected: protected:
virtual void Quit(); virtual void Quit();
virtual void MessageReceived(BMessage*); virtual void MessageReceived(BMessage*);
virtual void Show(); virtual void Show();
private: private:
static BRect InfoWindowRect(bool displayingSymlink); static BRect InfoWindowRect(bool displayingSymlink);
static int32 CalcSize(void*); static int32 CalcSize(void*);
Model* fModel; Model* fModel;
volatile bool fStopCalc; volatile bool fStopCalc;
int32 fIndex; int32 fIndex;
// tells where it lives with respect to other // tells where it lives with respect to other
thread_id fCalcThreadID; thread_id fCalcThreadID;
LockingList<BWindow>* fWindowList; LockingList<BWindow>* fWindowList;
FilePermissionsView* fPermissionsView; FilePermissionsView* fPermissionsView;
AttributeView* fAttributeView; AttributeView* fAttributeView;
BFilePanel* fFilePanel; BFilePanel* fFilePanel;
bool fFilePanelOpen; bool fFilePanelOpen;
typedef BWindow _inherited; typedef BWindow _inherited;
}; };
@@ -109,4 +109,5 @@ BInfoWindow::TargetModel() const
using namespace BPrivate; using namespace BPrivate;
#endif // INFO_WINDOW_H #endif // INFO_WINDOW_H