[haiku-commits] haiku: hrev47513 - in src: kits/tracker kits/storage/mime libs/icon kits/storage
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 18 Jul 2014 00:11:54 +0200 (CEST)
hrev47513 adds 27 changesets to branch 'master'
old head: c5dc7c1ef7a675cf2028b861cf29c8d3d9aae525
new head: 9f2a3f6f47d121411c85a1e939f1cda80a4b4b1d
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=9f2a3f6+%5Ec5dc7c1
----------------------------------------------------------------------------
021aaa4: Tracker: Style fix, capitalize share icons hex
... just to make them consistent with the rest.
6c424ff: Tracker: Tiny style fix to Bitmaps.cpp
49d37d9: Tracker: tiny style fix, explicit NULL check
6ab2085: Tracker: Style fixes to ContainerWindow
d7e6821: Tracker: miscellaneous style fixes
8dd0b0a: Tracker: style fixes to Model
d5868b5: Tracker: style fixes to PoseView
Variable renaming for consistency and clarity
f13a47d: Tracker: Pose style fixes kind => which
b77cc93: Tracker: Style fix, move headers down in Navigator.cpp
e17179d: Tracker: Style fixes to Navigator.h
f6d4955: Tracker: include ContainerWindow.h in Navigator.h
bd41bc5: Tracker: Style fixes in Tracker (app)
ee19664: Tracker: Update Tracker nav bitmaps and layout
ae7d51b: Tracker: Style fixes to IconCache and Utilities
c2d07d9: Tracker: yet more style fixes
dd3359a: Tracker: return B_BAD_VALUE if you pass in a NULL dir
7f68dcb: Tracker: Write Desktop icon attrs only once
537e1ff: Tracker: Write Trash icon attrs only once
Also create Trash if does not exist but check the if the icon
attrs are set separately.
Only set the vector trash icon #ifdef __HAIKU__ does this
even matter anymore?
8b96045: Tracker: style fixes to ContainerWindow
670b729: Tracker: style fixe, update comment, spelling
...and fits on 1 line
8e5c1f2: Tracker: style, reorder includes in DeskWindow.cpp
e8c8f85: Storage Kit: Style fixes to database_support.h
9bbfee0: BNodeInfo: Style fixes
* Remove public method docs, they are in Haiku Book only.
* Format private method docs as doxygen.
* Other style fixes like explicit NULL checks.
* Remove dead code in GetIcon() that isn't coming back.
* Pointer style.
bcd81d9: IconUtils: Style fixes
* Mostly just renaming variables for clarity and consistency
* whitespace
* fill out #pragma mark's
* indentation
3f2239f: Storage Kit: Style fixes to mime database
* Update doxygen docs a bit, especially returns.
* Some variable renaming for consistency and clarity, err/error => result.
* Remove some dead code that isn't coming back. (code moved to IconUtils)
* OpenType() returns a status_t, put it in a status_t, not a ssize_t.
and then later create a new ssize_t to hold the read bytes read
and use that, saves a lot of casting and confusion.
3a7f331: IconUtils: Improved error checking
9f2a3f6: Tracker: Move opening Desktop window to constructor
BRoster::Launch() sends B_REFS_RECEIVED before B_READY_TO_RUN
if the application is not running, so, when B_REFS_RECEIVED looked for
the Desktop window it wasn't created yet since that happen in ReadyToRun().
By creating the Desktop window in the constructor instead it is available
in RefsReceived() so an extra Desktop windows isn't opened.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
26 files changed, 1412 insertions(+), 1393 deletions(-)
headers/private/storage/mime/database_support.h | 58 +--
src/kits/storage/NodeInfo.cpp | 142 +-----
src/kits/storage/mime/DatabaseLocation.cpp | 531 +++++++++-----------
src/kits/tracker/BackgroundImage.cpp | 2 +-
src/kits/tracker/Bitmaps.cpp | 3 +-
src/kits/tracker/ContainerWindow.cpp | 160 +++---
src/kits/tracker/DeskWindow.cpp | 5 +-
src/kits/tracker/DesktopPoseView.cpp | 11 +-
src/kits/tracker/FSUtils.cpp | 123 +++--
src/kits/tracker/IconCache.cpp | 457 +++++++++--------
src/kits/tracker/IconCache.h | 31 +-
src/kits/tracker/IconMenuItem.cpp | 34 +-
src/kits/tracker/InfoWindow.cpp | 33 +-
src/kits/tracker/Model.cpp | 98 ++--
src/kits/tracker/Model.h | 10 +-
src/kits/tracker/Navigator.cpp | 45 +-
src/kits/tracker/Navigator.h | 26 +-
src/kits/tracker/Pose.cpp | 14 +-
src/kits/tracker/Pose.h | 12 +-
src/kits/tracker/PoseView.cpp | 44 +-
src/kits/tracker/Tracker.cpp | 126 +++--
src/kits/tracker/Tracker.h | 8 +-
src/kits/tracker/TrackerIcons.rdef | 372 ++++++++------
src/kits/tracker/Utilities.cpp | 86 ++--
src/kits/tracker/Utilities.h | 10 +-
src/libs/icon/IconUtils.cpp | 364 ++++++++------
############################################################################
Commit: 021aaa43d0f55e310cb4c018616d83e53d90d17b
URL: http://cgit.haiku-os.org/haiku/commit/?id=021aaa4
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sun Jun 22 03:17:24 2014 UTC
Tracker: Style fix, capitalize share icons hex
... just to make them consistent with the rest.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/TrackerIcons.rdef
b/src/kits/tracker/TrackerIcons.rdef
index 8f0171a..755a71a 100644
--- a/src/kits/tracker/TrackerIcons.rdef
+++ b/src/kits/tracker/TrackerIcons.rdef
@@ -2695,57 +2695,57 @@ resource(R_ResUpNavActiveSel) archive(, 0x00000000)
BBitmap {
};
resource(R_ShareIcon) #'ICON' array {
- $"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
- $"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
- $"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
- $"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
- $"ffffffffffffffffffffffffffffffffffffffffffffffff00000000ffffffff"
- $"ffffffffffff000000000000000000000000000000ffff003fd9d9d90000ffff"
- $"ffffffffff003f3f3f3f3f3f00003f3f3f3f3f3f3f00003fd9d9d9d9d9d90000"
- $"ffffffffff003fd9d9d9d90084840000d9d90000d93f3faaaad9d9d9d9d9d983"
- $"ffffffffff003fd9d9d9000000aa84840000d8d80000838383aaaad9d9d983aa"
- $"ffffffffff1100000000003f3f0000aa84848484d8d8003fd93f3faaaa83aaaa"
- $"ffffffffffff11000011003f3f3f3f0000aa8484848400d9d9d9d93f3faaaaaa"
- $"ffffffffffffff003f00003f3f3f3f3f3f0000aa848400d9d9d9d9d9d983aa01"
- $"ffffffffffffff00d83f3f00003f3f3f3f3f3f00aa8400d93f3fd9d9d9d9aa00"
- $"ffffffffffffffff00d8d83f3f00003f3f3f3f00aa8400d93f3fd9d9d9d98300"
- $"ffffffffffffffff00d8d8d8d83f3f00003f3f00aa8400d9d9d9d9d9d983aa01"
- $"ffffffffffffffff0000d8d8d8d8d83f3f003f00aa00d9d9d9d9d9d983aa0011"
- $"ffffffffffffff003f008484d8d8d8d8d8003f00aa00d9d9d9d9d983aa001111"
- $"ffffffffffff003fd98300008484d8d8d8d80000aa00d9d9d9d983aa001111ff"
- $"ffffffffff003fd98383003f00008484d8d80000aa00d9d9d983aa001111ffff"
- $"ffffffff003fd98383003fd9d983000084848400aa0010d983aa001111ffffff"
- $"ffffff003fd98383003fd9d98383003f0000840000001083aa001111ffffffff"
- $"ffff003fd98383003fd9d98383003fd9d9830000001083aa001111ffffffffff"
- $"ff003fd98383003fd9d98383003fd9d98383003fd983aa001111ffffffffffff"
- $"ff00d98383003fd9d98383003fd9d98383003fd98383001111ffffffffffffff"
- $"ffff0000003fd9d98383003fd9d98383003fd98383001111ffffffffffffffff"
- $"ffffff003fd9d98383003fd9d98383003fd98383001111ffffffffffffffffff"
- $"ffffff00d9838306003fd9d98383003fd98383001111ffffffffffffffffffff"
- $"ffffffff0000001000d9d98383003fd98383001111ffffffffffffffffffffff"
- $"ffffffffffffffffff000000003fd98300001111ffffffffffffffffffffffff"
- $"ffffffffffffffffffffffffff000000111111ffffffffffffffffffffffffff"
- $"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
- $"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFF"
+ $"FFFFFFFFFFFF000000000000000000000000000000FFFF003FD9D9D90000FFFF"
+ $"FFFFFFFFFF003F3F3F3F3F3F00003F3F3F3F3F3F3F00003FD9D9D9D9D9D90000"
+ $"FFFFFFFFFF003FD9D9D9D90084840000D9D90000D93F3FAAAAD9D9D9D9D9D983"
+ $"FFFFFFFFFF003FD9D9D9000000AA84840000D8D80000838383AAAAD9D9D983AA"
+ $"FFFFFFFFFF1100000000003F3F0000AA84848484D8D8003FD93F3FAAAA83AAAA"
+ $"FFFFFFFFFFFF11000011003F3F3F3F0000AA8484848400D9D9D9D93F3FAAAAAA"
+ $"FFFFFFFFFFFFFF003F00003F3F3F3F3F3F0000AA848400D9D9D9D9D9D983AA01"
+ $"FFFFFFFFFFFFFF00D83F3F00003F3F3F3F3F3F00AA8400D93F3FD9D9D9D9AA00"
+ $"FFFFFFFFFFFFFFFF00D8D83F3F00003F3F3F3F00AA8400D93F3FD9D9D9D98300"
+ $"FFFFFFFFFFFFFFFF00D8D8D8D83F3F00003F3F00AA8400D9D9D9D9D9D983AA01"
+ $"FFFFFFFFFFFFFFFF0000D8D8D8D8D83F3F003F00AA00D9D9D9D9D9D983AA0011"
+ $"FFFFFFFFFFFFFF003F008484D8D8D8D8D8003F00AA00D9D9D9D9D983AA001111"
+ $"FFFFFFFFFFFF003FD98300008484D8D8D8D80000AA00D9D9D9D983AA001111FF"
+ $"FFFFFFFFFF003FD98383003F00008484D8D80000AA00D9D9D983AA001111FFFF"
+ $"FFFFFFFF003FD98383003FD9D983000084848400AA0010D983AA001111FFFFFF"
+ $"FFFFFF003FD98383003FD9D98383003F0000840000001083AA001111FFFFFFFF"
+ $"FFFF003FD98383003FD9D98383003FD9D9830000001083AA001111FFFFFFFFFF"
+ $"FF003FD98383003FD9D98383003FD9D98383003FD983AA001111FFFFFFFFFFFF"
+ $"FF00D98383003FD9D98383003FD9D98383003FD98383001111FFFFFFFFFFFFFF"
+ $"FFFF0000003FD9D98383003FD9D98383003FD98383001111FFFFFFFFFFFFFFFF"
+ $"FFFFFF003FD9D98383003FD9D98383003FD98383001111FFFFFFFFFFFFFFFFFF"
+ $"FFFFFF00D9838306003FD9D98383003FD98383001111FFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFF0000001000D9D98383003FD98383001111FFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFF000000003FD98300001111FFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFF000000111111FFFFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
};
resource(R_MICN_ShareIcon) #'MICN' array {
- $"ffffffffffffffffffffffffffffffff"
- $"ffffffffffffffffffffffffffffffff"
- $"ffffff000000000000000f0fdad900ff"
- $"ffff0fdad9b08400d900da1783d9d983"
- $"ffff1800000f0f078484d80fda17aaaa"
- $"ffffff0f0f0f3f3f0f0784b0d9d983d1"
- $"ffffffffb0d90f0f3f0faab03fd9d9d0"
- $"ffffffff00d8d8d90f0f07d9d9d9aa08"
- $"ffffff0f830084d8d80007d9d9aa0818"
- $"ffff0f83d0da830084d10782aa0818ff"
- $"ff0f83d0da83d0da830008aa0818ffff"
- $"0f83d0da83d0da83d0da830818ffffff"
- $"ff0fda83d0da83d0da830818ffffffff"
- $"ffff0008b083d0da830818ffffffffff"
- $"ffffffffffff0f001118ffffffffffff"
- $"ffffffffffffffffffffffffffffffff"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+ $"FFFFFF000000000000000F0FDAD900FF"
+ $"FFFF0FDAD9B08400D900DA1783D9D983"
+ $"FFFF1800000F0F078484D80FDA17AAAA"
+ $"FFFFFF0F0F0F3F3F0F0784B0D9D983D1"
+ $"FFFFFFFFB0D90F0F3F0FAAB03FD9D9D0"
+ $"FFFFFFFF00D8D8D90F0F07D9D9D9AA08"
+ $"FFFFFF0F830084D8D80007D9D9AA0818"
+ $"FFFF0F83D0DA830084D10782AA0818FF"
+ $"FF0F83D0DA83D0DA830008AA0818FFFF"
+ $"0F83D0DA83D0DA83D0DA830818FFFFFF"
+ $"FF0FDA83D0DA83D0DA830818FFFFFFFF"
+ $"FFFF0008B083D0DA830818FFFFFFFFFF"
+ $"FFFFFFFFFFFF0F001118FFFFFFFFFFFF"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
};
############################################################################
Commit: 6c424fff1eae7022220a45d40f682baa0732b9e7
URL: http://cgit.haiku-os.org/haiku/commit/?id=6c424ff
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sun Jun 22 05:58:25 2014 UTC
Tracker: Tiny style fix to Bitmaps.cpp
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Bitmaps.cpp b/src/kits/tracker/Bitmaps.cpp
index 5f1b515..ce7f64f 100644
--- a/src/kits/tracker/Bitmaps.cpp
+++ b/src/kits/tracker/Bitmaps.cpp
@@ -210,7 +210,7 @@ BImageResources::find_image(void* memAddr) const
{
image_info info;
int32 cookie = 0;
- while (get_next_image_info(0, &cookie, &info) == B_OK)
+ while (get_next_image_info(0, &cookie, &info) == B_OK) {
if ((info.text <= memAddr
&& (((uint8*)info.text)+info.text_size) > memAddr)
|| (info.data <= memAddr
@@ -218,6 +218,7 @@ BImageResources::find_image(void* memAddr) const
// Found the image.
return info.id;
}
+ }
return -1;
}
############################################################################
Commit: 49d37d9438cab6d23423bb2e5d0a10c4b3537de3
URL: http://cgit.haiku-os.org/haiku/commit/?id=49d37d9
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jul 4 22:05:34 2014 UTC
Tracker: tiny style fix, explicit NULL check
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/BackgroundImage.cpp
b/src/kits/tracker/BackgroundImage.cpp
index 693449d..fb96183 100644
--- a/src/kits/tracker/BackgroundImage.cpp
+++ b/src/kits/tracker/BackgroundImage.cpp
@@ -190,7 +190,7 @@ void
BackgroundImage::Show(BackgroundImageInfo* info, BView* view)
{
BPoseView* poseView = dynamic_cast<BPoseView*>(view);
- if (poseView)
+ if (poseView != NULL)
poseView->SetWidgetTextOutline(info->fTextWidgetOutline);
if (info->fBitmap == NULL) {
############################################################################
Commit: 6ab2085f7b98ed57e6f285686b74408c7bd01d1e
URL: http://cgit.haiku-os.org/haiku/commit/?id=6ab2085
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sun Jun 22 21:14:31 2014 UTC
Tracker: Style fixes to ContainerWindow
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/ContainerWindow.cpp
b/src/kits/tracker/ContainerWindow.cpp
index 0ce9991..c2d6188 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -563,7 +563,7 @@ BContainerWindow::BContainerWindow(LockingList<BWindow>*
list,
{
InitIconPreloader();
- if (list) {
+ if (list != NULL) {
ASSERT(list->IsLocked());
list->AddItem(this);
}
@@ -888,8 +888,8 @@ BContainerWindow::Init(const BMessage* message)
float y_delta;
BEntry entry;
- ASSERT(fPoseView);
- if (!fPoseView)
+ ASSERT(fPoseView != NULL);
+ if (fPoseView == NULL)
return;
// deal with new unconfigured folders
@@ -985,7 +985,7 @@ BContainerWindow::Init(const BMessage* message)
}
unmodified.MakeEmpty();
- if (message)
+ if (message != NULL)
RestoreState(*message);
else
RestoreState();
############################################################################
Commit: d7e682113776632e5c04a6558eca0c5650a164e4
URL: http://cgit.haiku-os.org/haiku/commit/?id=d7e6821
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jul 4 23:25:11 2014 UTC
Tracker: miscellaneous style fixes
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/ContainerWindow.cpp
b/src/kits/tracker/ContainerWindow.cpp
index c2d6188..09e647a 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -121,10 +121,9 @@ class DraggableContainerIcon : public BView {
virtual void AttachedToWindow();
virtual void MouseDown(BPoint where);
- virtual void MouseUp(BPoint where);
- virtual void MouseMoved(BPoint point, uint32 /*transit*/,
- const BMessage* message);
- virtual void FrameMoved(BPoint newLocation);
+ virtual void MouseUp(BPoint);
+ virtual void MouseMoved(BPoint point, uint32, const BMessage*);
+ virtual void FrameMoved(BPoint);
virtual void Draw(BRect updateRect);
private:
@@ -333,7 +332,7 @@ DraggableContainerIcon::AttachedToWindow()
void
-DraggableContainerIcon::MouseDown(BPoint point)
+DraggableContainerIcon::MouseDown(BPoint where)
{
// we only like container windows
BContainerWindow* window = dynamic_cast<BContainerWindow*>(Window());
@@ -347,13 +346,13 @@ DraggableContainerIcon::MouseDown(BPoint point)
uint32 buttons;
window->CurrentMessage()->FindInt32("buttons", (int32*)&buttons);
- if (IconCache::sIconCache->IconHitTest(point, window->TargetModel(),
+ if (IconCache::sIconCache->IconHitTest(where, window->TargetModel(),
kNormalIcon, B_MINI_ICON)) {
// The click hit the icon, initiate a drag
fDragButton = buttons
& (B_PRIMARY_MOUSE_BUTTON | B_SECONDARY_MOUSE_BUTTON);
fDragStarted = false;
- fClickPoint = point;
+ fClickPoint = where;
} else
fDragButton = 0;
@@ -363,7 +362,7 @@ DraggableContainerIcon::MouseDown(BPoint point)
void
-DraggableContainerIcon::MouseUp(BPoint /*point*/)
+DraggableContainerIcon::MouseUp(BPoint)
{
if (!fDragStarted)
Window()->Activate(true);
@@ -374,12 +373,11 @@ DraggableContainerIcon::MouseUp(BPoint /*point*/)
void
-DraggableContainerIcon::MouseMoved(BPoint point, uint32 /*transit*/,
- const BMessage* /*message*/)
+DraggableContainerIcon::MouseMoved(BPoint where, uint32, const BMessage*)
{
if (fDragButton == 0 || fDragStarted
- || (abs((int32)(point.x - fClickPoint.x)) <= kDragSlop
- && abs((int32)(point.y - fClickPoint.y)) <= kDragSlop))
+ || (abs((int32)(where.x - fClickPoint.x)) <= kDragSlop
+ && abs((int32)(where.y - fClickPoint.y)) <= kDragSlop))
return;
BContainerWindow* window = static_cast<BContainerWindow*>(Window());
@@ -461,7 +459,7 @@ DraggableContainerIcon::MouseMoved(BPoint point, uint32
/*transit*/,
void
-DraggableContainerIcon::FrameMoved(BPoint /*newLocation*/)
+DraggableContainerIcon::FrameMoved(BPoint)
{
BMenuBar* bar = dynamic_cast<BMenuBar*>(Parent());
if (bar == NULL)
@@ -667,27 +665,27 @@ BContainerWindow::Quit()
fNavigationItem = NULL;
}
- if (fOpenWithItem && !fOpenWithItem->Menu()) {
+ if (fOpenWithItem != NULL && fOpenWithItem->Menu() == NULL) {
delete fOpenWithItem;
fOpenWithItem = NULL;
}
- if (fMoveToItem && !fMoveToItem->Menu()) {
+ if (fMoveToItem != NULL && fMoveToItem->Menu() == NULL) {
delete fMoveToItem;
fMoveToItem = NULL;
}
- if (fCopyToItem && !fCopyToItem->Menu()) {
+ if (fCopyToItem != NULL && fCopyToItem->Menu() == NULL) {
delete fCopyToItem;
fCopyToItem = NULL;
}
- if (fCreateLinkItem && !fCreateLinkItem->Menu()) {
+ if (fCreateLinkItem != NULL && fCreateLinkItem->Menu() == NULL) {
delete fCreateLinkItem;
fCreateLinkItem = NULL;
}
- if (fAttrMenu && !fAttrMenu->Supermenu()) {
+ if (fAttrMenu != NULL && fAttrMenu->Supermenu() == NULL) {
delete fAttrMenu;
fAttrMenu = NULL;
}
@@ -1563,14 +1561,14 @@ BContainerWindow::MessageReceived(BMessage* message)
|| isRoot !=
PoseView()->TargetModel()->IsRoot())
RepopulateMenus();
- // Update Navigation bar
- if (Navigator()) {
+ if (Navigator() != NULL) {
+ // update Navigation bar
int32 action = kActionSet;
- if
(message->FindInt32("action", &action) != B_OK)
+ if
(message->FindInt32("action", &action) != B_OK) {
// Design problem? Why
does FindInt32 touch
// 'action' at all if
he can't find it??
action = kActionSet;
-
+ }
Navigator()->UpdateLocation(PoseView()->TargetModel(),
action);
}
diff --git a/src/kits/tracker/DesktopPoseView.cpp
b/src/kits/tracker/DesktopPoseView.cpp
index 93a9503..beaba08 100644
--- a/src/kits/tracker/DesktopPoseView.cpp
+++ b/src/kits/tracker/DesktopPoseView.cpp
@@ -80,18 +80,17 @@ DesktopPoseView::InitDesktopDirentIterator(BPoseView*
nodeMonitoringTarget,
ASSERT(!sourceModel.IsQuery());
ASSERT(!sourceModel.IsVirtualDirectory());
- ASSERT(sourceModel.Node());
- BDirectory* sourceDirectory
- = dynamic_cast<BDirectory*>(sourceModel.Node());
+ ASSERT(sourceModel.Node() != NULL);
- ASSERT(sourceDirectory);
+ BDirectory* sourceDirectory =
dynamic_cast<BDirectory*>(sourceModel.Node());
+ ASSERT(sourceDirectory != NULL);
// build an iterator list, start with boot
EntryListBase* perDesktopIterator
= new CachedDirectoryEntryList(*sourceDirectory);
result->AddItem(perDesktopIterator);
- if (nodeMonitoringTarget) {
+ if (nodeMonitoringTarget != NULL) {
TTracker::WatchNode(sourceModel.NodeRef(),
B_WATCH_DIRECTORY | B_WATCH_NAME | B_WATCH_STAT |
B_WATCH_ATTR,
nodeMonitoringTarget);
@@ -99,7 +98,7 @@ DesktopPoseView::InitDesktopDirentIterator(BPoseView*
nodeMonitoringTarget,
if (result->Rewind() != B_OK) {
delete result;
- if (nodeMonitoringTarget)
+ if (nodeMonitoringTarget != NULL)
nodeMonitoringTarget->HideBarberPole();
return NULL;
diff --git a/src/kits/tracker/InfoWindow.cpp b/src/kits/tracker/InfoWindow.cpp
index 57406a1..fe2ac32 100644
--- a/src/kits/tracker/InfoWindow.cpp
+++ b/src/kits/tracker/InfoWindow.cpp
@@ -304,7 +304,7 @@ BInfoWindow::BInfoWindow(Model* model, int32 group_index,
TTracker::WatchNode(model->NodeRef(), B_WATCH_ALL | B_WATCH_MOUNT,
this);
// window list is Locked by Tracker around this constructor
- if (list)
+ if (list != NULL)
list->AddItem(this);
AddShortcut('E', 0, new BMessage(kEditItem));
@@ -597,15 +597,15 @@ BInfoWindow::MessageReceived(BMessage* message)
case B_NODE_MONITOR:
switch (message->FindInt32("opcode")) {
case B_ENTRY_REMOVED:
- {
- node_ref itemNode;
- message->FindInt32("device",
&itemNode.device);
- message->FindInt64("node",
&itemNode.node);
- // our window itself may be
deleted
- if (*TargetModel()->NodeRef()
== itemNode)
- Close();
- break;
- }
+ {
+ node_ref itemNode;
+ message->FindInt32("device",
&itemNode.device);
+ message->FindInt64("node",
&itemNode.node);
+ // our window itself may be deleted
+ if (*TargetModel()->NodeRef() ==
itemNode)
+ Close();
+ break;
+ }
case B_ENTRY_MOVED:
case B_STAT_CHANGED:
@@ -640,11 +640,12 @@ BInfoWindow::MessageReceived(BMessage* message)
case kPermissionsSelected:
if (fPermissionsView == NULL) {
// Only true on first call.
- fPermissionsView
- = new
FilePermissionsView(BRect(kBorderWidth + 1,
- fAttributeView->Bounds().bottom,
- fAttributeView->Bounds().right,
- fAttributeView->Bounds().bottom+80),
fModel);
+ fPermissionsView = new FilePermissionsView(
+ BRect(kBorderWidth + 1,
+ fAttributeView->Bounds().bottom,
+ fAttributeView->Bounds().right,
+ fAttributeView->Bounds().bottom
+ 80),
+ fModel);
ResizeBy(0,
fPermissionsView->Bounds().Height());
fAttributeView->AddChild(fPermissionsView);
@@ -1168,11 +1169,9 @@ AttributeView::ModelChanged(Model* model, BMessage*
message)
if (message->FindString("attr", &attrName) == B_OK) {
if (strcmp(attrName, kAttrLargeIcon) == 0
|| strcmp(attrName, kAttrIcon) == 0) {
-
IconCache::sIconCache->IconChanged(model->ResolveIfLink());
Invalidate();
} else if (strcmp(attrName, kAttrMIMEType) ==
0) {
-
if (model->OpenNode() == B_OK) {
model->AttrChanged(attrName);
InitStrings(model);
diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index 327d769..b25a65e 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -890,12 +890,12 @@ Model::WatchVolumeAndMountPoint(uint32 , BHandler* target)
BEntry mountPointEntry(bootMountPoint.String());
Model mountPointModel(&mountPointEntry);
- TTracker::WatchNode(mountPointModel.NodeRef(), B_WATCH_NAME
- | B_WATCH_STAT | B_WATCH_ATTR, target);
+ TTracker::WatchNode(mountPointModel.NodeRef(),
+ B_WATCH_NAME | B_WATCH_STAT | B_WATCH_ATTR, target);
}
- return TTracker::WatchNode(NodeRef(), B_WATCH_NAME | B_WATCH_STAT
- | B_WATCH_ATTR, target);
+ return TTracker::WatchNode(NodeRef(),
+ B_WATCH_NAME | B_WATCH_STAT | B_WATCH_ATTR, target);
}
@@ -907,13 +907,13 @@ Model::AttrChanged(const char* attrName)
// return true if icon needs updating
ASSERT(IsNodeOpen());
- if (attrName
+ if (attrName != NULL
&& (strcmp(attrName, kAttrIcon) == 0
|| strcmp(attrName, kAttrMiniIcon) == 0
|| strcmp(attrName, kAttrLargeIcon) == 0))
return true;
- if (!attrName
+ if (attrName == NULL
|| strcmp(attrName, kAttrMIMEType) == 0
|| strcmp(attrName, kAttrPreferredApp) == 0) {
char mimeString[B_MIME_TYPE_LENGTH];
@@ -923,24 +923,24 @@ Model::AttrChanged(const char* attrName)
else {
// node has a specific mime type
fMimeType = mimeString;
- if (!IsVolume()
- && !IsSymLink()
- && info.GetPreferredApp(mimeString) == B_OK)
+ if (!IsVolume() && !IsSymLink()
+ && info.GetPreferredApp(mimeString) == B_OK) {
SetPreferredAppSignature(mimeString);
+ }
}
#if xDEBUG
- if (fIconFrom != kNode)
+ if (fIconFrom != kNode) {
PRINT(("%s, %s:updating icon because file type
changed\n",
- Name(), attrName ? attrName : ""));
- else
- PRINT(("not updating icon even thoug type changed "
- "because icon from node\n"));
-
+ Name(), attrName != NULL ? attrName : ""));
+ } else {
+ PRINT(("Not updating icon even though type changed "
+ "because icon is from node.\n"));
+ }
#endif
return fIconFrom != kNode;
- // update icon unless it is comming from a node
+ // update icon unless it is coming from a node
}
return attrName == NULL;
diff --git a/src/kits/tracker/Model.h b/src/kits/tracker/Model.h
index 5c656b4..e916e1a 100644
--- a/src/kits/tracker/Model.h
+++ b/src/kits/tracker/Model.h
@@ -74,6 +74,7 @@ enum {
kModelSupportsFile
};
+
class Model {
public:
Model();
@@ -482,9 +483,10 @@ Model::HasLocalizedName() const
inline
ModelNodeLazyOpener::ModelNodeLazyOpener(Model* model, bool writable,
bool openLater)
- : fModel(model),
- fWasOpen(model->IsNodeOpen()),
- fWasOpenForWriting(model->IsNodeOpenForWriting())
+ :
+ fModel(model),
+ fWasOpen(model->IsNodeOpen()),
+ fWasOpenForWriting(model->IsNodeOpenForWriting())
{
if (!openLater)
OpenNode(writable);
diff --git a/src/kits/tracker/Pose.h b/src/kits/tracker/Pose.h
index 44ff003..02d5e0b 100644
--- a/src/kits/tracker/Pose.h
+++ b/src/kits/tracker/Pose.h
@@ -77,7 +77,7 @@ public:
void DrawBar(BPoint where, BView* view, icon_size kind);
- void DrawIcon(BPoint, BView*, icon_size, bool direct,
+ void DrawIcon(BPoint where, BView* view, icon_size kind, bool direct,
bool drawUnselected = false);
void DrawToggleSwitch(BRect, BPoseView*);
void MouseUp(BPoint poseLoc, BPoseView*, BPoint where, int32 index);
@@ -166,13 +166,15 @@ BPose::TargetModel() const
inline Model*
BPose::ResolvedModel() const
{
- return fModel->IsSymLink() ?
- (fModel->LinkTo() ? fModel->LinkTo() : fModel) : fModel;
+ if (fModel->IsSymLink())
+ return fModel->LinkTo() != NULL ? fModel->LinkTo() : fModel;
+ else
+ return fModel;
}
inline bool
-BPose::IsSelected() const
+BPose::IsSelected() const
{
return fIsSelected;
}
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 13fc149..9cce4fa 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -5748,7 +5748,7 @@ BPoseView::AttributeChanged(const BMessage* message)
&& targetModel->IsNodeOpen()
&& targetModel->AttrChanged(attrName)) {
// the icon of our target has changed, update drag icon
- // TODO: make this simpler (ie. store the icon with the window)
+ // TODO: make this simpler (i.e. store the icon with the window)
BView* view = Window()->FindView("MenuBar");
if (view != NULL) {
view = view->FindView("ThisContainer");
@@ -5766,7 +5766,7 @@ BPoseView::AttributeChanged(const BMessage* message)
for (int i = 0; i < posesCount; i++) {
BPose* pose = posesFound->ItemAt(i);
Model* poseModel = pose->TargetModel();
- if (poseModel->IsSymLink() && *poseModel->NodeRef() !=
itemNode) {
+ if (poseModel->IsSymLink() && *(poseModel->NodeRef()) !=
itemNode) {
// change happened on symlink's target
poseModel = poseModel->ResolveIfLink();
}
############################################################################
Commit: 8dd0b0aeac1b8f1f7427c7c494a0bb0e636eb195
URL: http://cgit.haiku-os.org/haiku/commit/?id=8dd0b0a
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Jul 15 00:31:08 2014 UTC
Tracker: style fixes to Model
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index b25a65e..6711213 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -73,6 +73,10 @@ All rights reserved.
#include "Utilities.h"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Model"
+
+
#ifdef CHECK_OPEN_MODEL_LEAKS
BObjectList<Model>* writableOpenModelList = NULL;
BObjectList<Model>* readOnlyOpenModelList = NULL;
@@ -88,11 +92,17 @@ bool CheckNodeIconHintPrivate(const BNode*, bool);
} // namespace BPrivate
-// #pragma mark - Model()
-#undef B_TRANSLATION_CONTEXT
-#define B_TRANSLATION_CONTEXT "Model"
+static bool
+HasVectorIconHint(BNode* node)
+{
+ attr_info info;
+ return node->GetAttrInfo(kAttrIcon, &info) == B_OK;
+}
+
+
+// #pragma mark - Model()
Model::Model()
@@ -190,7 +200,6 @@ Model::DeletePreferredAppVolumeNameLinkTo()
// deal with link to link to self
fLinkTo = NULL;
delete tmp;
-
} else if (IsVolume())
free(fVolumeName);
else
@@ -203,19 +212,21 @@ Model::DeletePreferredAppVolumeNameLinkTo()
Model::~Model()
{
#ifdef CHECK_OPEN_MODEL_LEAKS
- if (writableOpenModelList)
+ if (writableOpenModelList != NULL)
writableOpenModelList->RemoveItem(this);
- if (readOnlyOpenModelList)
+
+ if (readOnlyOpenModelList != NULL)
readOnlyOpenModelList->RemoveItem(this);
#endif
DeletePreferredAppVolumeNameLinkTo();
- if (IconCache::NeedsDeletionNotification((IconSource)fIconFrom))
+ if (IconCache::NeedsDeletionNotification((IconSource)fIconFrom)) {
// this check allows us to use temporary Model in the IconCache
// without the danger of a deadlock
IconCache::sIconCache->Deleting(this);
+ }
#if xDEBUG
- if (fNode)
+ if (fNode != NULL)
PRINT(("destructor closing node for %s\n", Name()));
#endif
@@ -423,9 +434,10 @@ Model::OpenNodeCommon(bool writable)
#endif
#ifdef CHECK_OPEN_MODEL_LEAKS
- if (writableOpenModelList)
+ if (writableOpenModelList != NULL)
writableOpenModelList->RemoveItem(this);
- if (readOnlyOpenModelList)
+
+ if (readOnlyOpenModelList != NULL)
readOnlyOpenModelList->RemoveItem(this);
#endif
@@ -490,7 +502,7 @@ Model::OpenNodeCommon(bool writable)
fWritable = writable;
- if (!fMimeType.Length())
+ if (fMimeType.Length() <= 0)
FinishSettingUpType();
#ifdef CHECK_OPEN_MODEL_LEAKS
@@ -524,10 +536,10 @@ Model::CloseNode()
#endif
#ifdef CHECK_OPEN_MODEL_LEAKS
- if (writableOpenModelList)
+ if (writableOpenModelList != NULL)
writableOpenModelList->RemoveItem(this);
- if (readOnlyOpenModelList)
+ if (readOnlyOpenModelList != NULL)
readOnlyOpenModelList->RemoveItem(this);
#endif
@@ -562,12 +574,13 @@ Model::SetupBaseType()
case S_IFREG:
// regular file
- if (fStatBuf.st_mode & S_IXUSR)
+ if ((fStatBuf.st_mode & S_IXUSR) != 0) {
// executable
fBaseType = kExecutableNode;
- else
+ } else {
// non-executable
fBaseType = kPlainNode;
+ }
break;
case S_IFLNK:
@@ -596,14 +609,6 @@ Model::CacheLocalizedName()
}
-static bool
-HasVectorIconHint(BNode* node)
-{
- attr_info info;
- return node->GetAttrInfo(kAttrIcon, &info) == B_OK;
-}
-
-
void
Model::FinishSettingUpType()
{
@@ -733,13 +738,13 @@ Model::FinishSettingUpType()
fPreferredAppName =
strdup(signature);
}
}
- if (!fMimeType.Length())
+ if (fMimeType.Length() <= 0)
fMimeType = B_APP_MIME_TYPE;
// should use a shared string here
break;
default:
- if (!fMimeType.Length())
+ if (fMimeType.Length() <= 0)
fMimeType = B_FILE_MIMETYPE;
break;
}
@@ -756,7 +761,7 @@ Model::ResetIconFrom()
// mirror the logic from FinishSettingUpType
if ((fBaseType == kDirectoryNode || fBaseType == kVolumeNode
- || fBaseType == kTrashNode || fBaseType == kDesktopNode)
+ || fBaseType == kTrashNode || fBaseType == kDesktopNode)
&& !CheckNodeIconHintPrivate(fNode,
dynamic_cast<TTracker*>(be_app) == NULL)) {
if (WellKnowEntryList::Match(NodeRef()) > (directory_which)-1) {
@@ -910,8 +915,9 @@ Model::AttrChanged(const char* attrName)
if (attrName != NULL
&& (strcmp(attrName, kAttrIcon) == 0
|| strcmp(attrName, kAttrMiniIcon) == 0
- || strcmp(attrName, kAttrLargeIcon) == 0))
+ || strcmp(attrName, kAttrLargeIcon) == 0)) {
return true;
+ }
if (attrName == NULL
|| strcmp(attrName, kAttrMIMEType) == 0
@@ -953,6 +959,7 @@ Model::StatChanged()
ASSERT(IsNodeOpen());
mode_t oldMode = fStatBuf.st_mode;
fStatus = fNode->GetStat(&fStatBuf);
+
if (oldMode != fStatBuf.st_mode) {
bool forWriting = IsNodeOpenForWriting();
CloseNode();
@@ -961,11 +968,12 @@ Model::StatChanged()
OpenNodeCommon(forWriting);
return true;
}
+
return false;
}
-// #pragma mark - Mime handling methods
+// #pragma mark - Mime handling methods
bool
@@ -1227,7 +1235,7 @@ Model::Mimeset(bool force)
update_mime_info(path.Path(), 0, 1, force ? 2 : 0);
ModelNodeLazyOpener opener(this);
opener.OpenNode();
- AttrChanged(0);
+ AttrChanged(NULL);
return !oldType.ICompare(MimeType());
}
diff --git a/src/kits/tracker/Model.h b/src/kits/tracker/Model.h
index e916e1a..a349f92 100644
--- a/src/kits/tracker/Model.h
+++ b/src/kits/tracker/Model.h
@@ -168,7 +168,7 @@ public:
// Node monitor update call
void UpdateEntryRef(const node_ref* dirRef, const char* name);
- bool AttrChanged(const char*);
+ bool AttrChanged(const char* attrName);
// returns true if pose needs to update it's icon, etc.
// pass null to force full update
bool StatChanged();
############################################################################
Commit: d5868b5976a3c2f35ab9451dacb6783b85576f20
URL: http://cgit.haiku-os.org/haiku/commit/?id=d5868b5
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jun 27 05:26:12 2014 UTC
Tracker: style fixes to PoseView
Variable renaming for consistency and clarity
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 9cce4fa..7d74ef2 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -670,7 +670,7 @@ BPoseView::SaveColumnState(AttributeStreamNode* node)
void
-BPoseView::SaveColumnState(BMessage &message) const
+BPoseView::SaveColumnState(BMessage& message) const
{
for (int32 index = 0; ; index++) {
const BColumn* column = ColumnAt(index);
@@ -695,7 +695,7 @@ BPoseView::SaveState(AttributeStreamNode* node)
const char* viewStateAttr;
const char* viewStateAttrForeign;
- if (TargetModel() && TargetModel()->IsRoot()) {
+ if (TargetModel() != NULL && TargetModel()->IsRoot()) {
viewStateAttr = kAttrDisksViewState;
viewStateAttrForeign = kAttrDisksViewStateForeign;
} else {
@@ -711,7 +711,7 @@ BPoseView::SaveState(AttributeStreamNode* node)
void
-BPoseView::SaveState(BMessage &message) const
+BPoseView::SaveState(BMessage& message) const
{
SaveColumnState(message);
fViewState->ArchiveToMessage(message);
@@ -757,7 +757,7 @@ BPoseView::SavePoseLocations(BRect* frameIfDesktop)
return;
}
- bool desktop = IsDesktopWindow() && (frameIfDesktop != NULL);
+ bool isDesktop = IsDesktopWindow() && (frameIfDesktop != NULL);
int32 count = fPoseList->CountItems();
for (int32 index = 0; index < count; index++) {
@@ -777,7 +777,7 @@ BPoseView::SavePoseLocations(BRect* frameIfDesktop)
size_t extendedPoseInfoSize = 0;
ModelNodeLazyOpener opener(model, true);
- if (desktop) {
+ if (isDesktop) {
opener.OpenNode(true);
// if saving desktop icons, save an extended
pose info too
extendedPoseInfo = ReadExtendedPoseInfo(model);
@@ -810,27 +810,28 @@ BPoseView::SavePoseLocations(BRect* frameIfDesktop)
ASSERT(model);
ASSERT(model->InitCheck() == B_OK);
// special handling for "root" disks icon
- // and trash pose on desktop dir
+ // and Trash pose on Desktop directory
bool isTrash = model->IsTrash() && IsDesktopView();
if (model->IsRoot() || isTrash) {
- BDirectory dir;
- if (FSGetDeskDir(&dir) == B_OK) {
+ BDirectory deskDir;
+ if (FSGetDeskDir(&deskDir) == B_OK) {
const char* poseInfoAttr = isTrash ?
kAttrTrashPoseInfo
: kAttrDisksPoseInfo;
const char* poseInfoAttrForeign =
isTrash
? kAttrTrashPoseInfoForeign
: kAttrDisksPoseInfoForeign;
- if (dir.WriteAttr(poseInfoAttr,
B_RAW_TYPE, 0,
- &poseInfo, sizeof(poseInfo)) ==
sizeof(poseInfo))
+ if (deskDir.WriteAttr(poseInfoAttr,
B_RAW_TYPE, 0,
+ &poseInfo, sizeof(poseInfo)) ==
sizeof(poseInfo)) {
// nuke opposite endianness
-
dir.RemoveAttr(poseInfoAttrForeign);
+
deskDir.RemoveAttr(poseInfoAttrForeign);
+ }
- if (!isTrash && desktop
- &&
dir.WriteAttr(kAttrExtendedDisksPoseInfo,
+ if (!isTrash && isDesktop
+ &&
deskDir.WriteAttr(kAttrExtendedDisksPoseInfo,
B_RAW_TYPE, 0,
extendedPoseInfo, extendedPoseInfoSize)
==
(ssize_t)extendedPoseInfoSize) {
// nuke opposite endianness
-
dir.RemoveAttr(kAttrExtendedDisksPoseInfoForegin);
+
deskDir.RemoveAttr(kAttrExtendedDisksPoseInfoForegin);
}
}
} else {
@@ -838,7 +839,7 @@ BPoseView::SavePoseLocations(BRect* frameIfDesktop)
kAttrPoseInfoForeign, B_RAW_TYPE, 0,
&poseInfo,
sizeof(poseInfo));
- if (desktop) {
+ if (isDesktop) {
model->WriteAttrKillForeign(kAttrExtendedPoseInfo,
kAttrExtendedPoseInfoForegin,
B_RAW_TYPE, 0, extendedPoseInfo,
@@ -5741,7 +5742,8 @@ BPoseView::AttributeChanged(const BMessage* message)
message->FindInt64("node", (int64*)&itemNode.node);
const char* attrName;
- message->FindString("attr", &attrName);
+ if (message->FindString("attr", &attrName) != B_OK)
+ attrName = NULL;
Model* targetModel = TargetModel();
if (targetModel != NULL && *targetModel->NodeRef() == itemNode
@@ -5799,7 +5801,7 @@ BPoseView::AttributeChanged(const BMessage* message)
}
BPoint loc(0, index * fListElemHeight);
- if (attrName && poseModel->Node() != NULL) {
+ if (attrName != NULL && poseModel->Node() != NULL) {
memset(&info, 0, sizeof(attr_info));
// the call below might fail if the attribute has been
removed
poseModel->Node()->GetAttrInfo(attrName, &info);
@@ -5841,7 +5843,7 @@ BPoseView::AttributeChanged(const BMessage* message)
continue;
for (int i = sizeof(sAttrColumnMap) /
sizeof(attr_column_relation);
- i--;) {
+ i--;) {
if (sAttrColumnMap[i].attrHash == PrimarySort()
|| sAttrColumnMap[i].attrHash ==
SecondarySort()) {
if ((fields &
sAttrColumnMap[i].fieldMask) != 0) {
@@ -8973,7 +8975,7 @@ void
BPoseView::Draw(BRect updateRect)
{
if (IsDesktopWindow()) {
- BScreen screen(Window());
+ BScreen screen(Window());
rgb_color color = screen.DesktopColor();
SetLowColor(color);
SetViewColor(color);
############################################################################
Commit: f13a47d22483f23f0dd9cc9ce043c25ba73bd073
URL: http://cgit.haiku-os.org/haiku/commit/?id=f13a47d
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Jul 15 04:44:27 2014 UTC
Tracker: Pose style fixes kind => which
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Pose.cpp b/src/kits/tracker/Pose.cpp
index 74bfd49b..b754756 100644
--- a/src/kits/tracker/Pose.cpp
+++ b/src/kits/tracker/Pose.cpp
@@ -806,7 +806,7 @@ BPose::TestLargeIconPixel(BPoint point) const
void
-BPose::DrawIcon(BPoint where, BView* view, icon_size kind, bool direct,
+BPose::DrawIcon(BPoint where, BView* view, icon_size which, bool direct,
bool drawUnselected)
{
if (fClipboardMode == kMoveSelectionTo) {
@@ -818,16 +818,16 @@ BPose::DrawIcon(BPoint where, BView* view, icon_size
kind, bool direct,
view->SetDrawingMode(B_OP_OVER);
IconCache::sIconCache->Draw(ResolvedModel(), view, where,
- fIsSelected && !drawUnselected ? kSelectedIcon : kNormalIcon,
kind,
+ fIsSelected && !drawUnselected ? kSelectedIcon : kNormalIcon,
which,
true);
if (fPercent != -1)
- DrawBar(where, view, kind);
+ DrawBar(where, view, which);
}
void
-BPose::DrawBar(BPoint where, BView* view, icon_size kind)
+BPose::DrawBar(BPoint where, BView* view, icon_size which)
{
view->PushState();
@@ -835,9 +835,9 @@ BPose::DrawBar(BPoint where, BView* view, icon_size kind)
int32 barWidth;
int32 barHeight;
int32 yOffset;
- if (kind >= B_LARGE_ICON) {
- size = kind - 1;
- barWidth = (int32)(7.0f / 32.0f * (float)kind);
+ if (which >= B_LARGE_ICON) {
+ size = which - 1;
+ barWidth = (int32)(7.0f / 32.0f * (float)which);
yOffset = 2;
barHeight = size - 4 - 2 * yOffset;
} else {
diff --git a/src/kits/tracker/Pose.h b/src/kits/tracker/Pose.h
index 02d5e0b..2d831e1 100644
--- a/src/kits/tracker/Pose.h
+++ b/src/kits/tracker/Pose.h
@@ -75,9 +75,9 @@ public:
// special purpose draw call for deselecting over a textured
// background
- void DrawBar(BPoint where, BView* view, icon_size kind);
+ void DrawBar(BPoint where, BView* view, icon_size which);
- void DrawIcon(BPoint where, BView* view, icon_size kind, bool direct,
+ void DrawIcon(BPoint where, BView* view, icon_size which, bool direct,
bool drawUnselected = false);
void DrawToggleSwitch(BRect, BPoseView*);
void MouseUp(BPoint poseLoc, BPoseView*, BPoint where, int32 index);
############################################################################
Commit: b77cc9391a77d737f5359f724835586c4d882bb4
URL: http://cgit.haiku-os.org/haiku/commit/?id=b77cc93
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sun Jun 22 21:15:48 2014 UTC
Tracker: Style fix, move headers down in Navigator.cpp
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Navigator.cpp b/src/kits/tracker/Navigator.cpp
index 9d5bdd6..afdb3a4 100644
--- a/src/kits/tracker/Navigator.cpp
+++ b/src/kits/tracker/Navigator.cpp
@@ -33,18 +33,18 @@ All rights reserved.
*/
-#include "Bitmaps.h"
-#include "Commands.h"
-#include "ContainerWindow.h"
-#include "FSUtils.h"
-#include "Model.h"
#include "Navigator.h"
-#include "Tracker.h"
#include <Picture.h>
#include <TextControl.h>
#include <Window.h>
+#include "Bitmaps.h"
+#include "Commands.h"
+#include "FSUtils.h"
+#include "Model.h"
+#include "Tracker.h"
+
namespace BPrivate {
############################################################################
Commit: e17179d381410f7dd7d573838d2acb57fcdebab1
URL: http://cgit.haiku-os.org/haiku/commit/?id=e17179d
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sun Jun 22 21:28:20 2014 UTC
Tracker: Style fixes to Navigator.h
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Navigator.h b/src/kits/tracker/Navigator.h
index 2cb1e51..146a414 100644
--- a/src/kits/tracker/Navigator.h
+++ b/src/kits/tracker/Navigator.h
@@ -35,11 +35,11 @@ All rights reserved.
#define _NAVIGATOR_H
-#include "Model.h"
-
#include <PictureButton.h>
#include <View.h>
+#include "Model.h"
+
class BTextControl;
class BEntry;
@@ -67,12 +67,12 @@ enum NavigationAction
// bitmap resource IDs as arguments
class BNavigatorButton : public BPictureButton {
public:
- BNavigatorButton(BRect rect, const char* name, BMessage* message, int32
resIDon,
- int32 resIDoff, int32 resIDdisabled);
+ BNavigatorButton(BRect rect, const char* name, BMessage* message,
+ int32 resIDon, int32 resIDoff, int32 resIDdisabled);
~BNavigatorButton();
- virtual void AttachedToWindow();
+ virtual void AttachedToWindow();
void SetPicture(BBitmap*, bool enabled, bool on);
@@ -99,9 +99,10 @@ protected:
virtual void Draw(BRect rect);
virtual void MessageReceived(BMessage* msg);
virtual void AttachedToWindow();
- virtual void AllAttached();
+ virtual void AllAttached();
- void GoForward(bool option); // is option key held down?
+ void GoForward(bool option);
+ // is option key held down?
void GoBackward(bool option);
void GoUp(bool option);
void SendNavigationMessage(NavigationAction, BEntry*, bool option);
@@ -109,11 +110,11 @@ protected:
void GoTo();
private:
- BPath fPath;
- BNavigatorButton* fBack;
- BNavigatorButton* fForw;
- BNavigatorButton* fUp;
- BTextControl* fLocation;
+ BPath fPath;
+ BNavigatorButton* fBack;
+ BNavigatorButton* fForw;
+ BNavigatorButton* fUp;
+ BTextControl* fLocation;
BObjectList<BPath> fBackHistory;
BObjectList<BPath> fForwHistory;
############################################################################
Commit: f6d495501ec9cf69d50f17e9f1c444ca1c946600
URL: http://cgit.haiku-os.org/haiku/commit/?id=f6d4955
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sun Jun 22 21:41:32 2014 UTC
Tracker: include ContainerWindow.h in Navigator.h
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Navigator.h b/src/kits/tracker/Navigator.h
index 146a414..8cb5599 100644
--- a/src/kits/tracker/Navigator.h
+++ b/src/kits/tracker/Navigator.h
@@ -38,6 +38,7 @@ All rights reserved.
#include <PictureButton.h>
#include <View.h>
+#include "ContainerWindow.h"
#include "Model.h"
############################################################################
Commit: bd41bc5105b94cbb16587be37436f32526b91ada
URL: http://cgit.haiku-os.org/haiku/commit/?id=bd41bc5
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jun 27 18:50:43 2014 UTC
Tracker: Style fixes in Tracker (app)
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp
index a7e88d2..5725325 100644
--- a/src/kits/tracker/Tracker.cpp
+++ b/src/kits/tracker/Tracker.cpp
@@ -448,14 +448,14 @@ TTracker::MessageReceived(BMessage* message)
break;
case kCloseWindowAndChildren:
- {
- const node_ref* itemNode;
- ssize_t bytes;
- message->FindData("node_ref", B_RAW_TYPE,
- (const void**)&itemNode, &bytes);
- CloseWindowAndChildren(itemNode);
- break;
- }
+ {
+ const node_ref* itemNode;
+ ssize_t bytes;
+ message->FindData("node_ref", B_RAW_TYPE,
+ (const void**)&itemNode, &bytes);
+ CloseWindowAndChildren(itemNode);
+ break;
+ }
case kCloseAllWindows:
CloseAllWindows();
diff --git a/src/kits/tracker/Tracker.h b/src/kits/tracker/Tracker.h
index b36d686..b8277e0 100644
--- a/src/kits/tracker/Tracker.h
+++ b/src/kits/tracker/Tracker.h
@@ -85,9 +85,9 @@ public:
virtual void Quit();
virtual bool QuitRequested();
virtual void ReadyToRun();
- virtual void MessageReceived(BMessage*);
+ virtual void MessageReceived(BMessage* message);
virtual void Pulse();
- virtual void RefsReceived(BMessage*);
+ virtual void RefsReceived(BMessage* message);
virtual void ArgvReceived(int32 argc, char** argv);
MimeTypeList* MimeTypes() const;
############################################################################
Commit: ee196640fb39b13fb872c3abe3347b2e994fde44
URL: http://cgit.haiku-os.org/haiku/commit/?id=ee19664
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sun Jun 22 21:30:28 2014 UTC
Tracker: Update Tracker nav bitmaps and layout
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Navigator.cpp b/src/kits/tracker/Navigator.cpp
index afdb3a4..74efc5b 100644
--- a/src/kits/tracker/Navigator.cpp
+++ b/src/kits/tracker/Navigator.cpp
@@ -57,6 +57,11 @@ static const int32 kMaxHistory = 32;
// pictures when we can, e.g. on a AttachedToWindow.
static BPicture sPicture;
+static const float kButtonWidth = 19.0f;
+static const float kButtonSpacing = 31.0f;
+ // button width and spacing forms a golden rectangle
+static const float kLeftMargin = 9.0f;
+
// #pragma mark - BNavigatorButton
@@ -147,25 +152,35 @@ BNavigator::BNavigator(const Model* model, BRect rect,
uint32 resizeMask)
float top = 2 + (be_plain_font->Size() - 8) / 2;
// Set up widgets
- fBack = new BNavigatorButton(BRect(3, top, 21, top + 17), "Back",
- new BMessage(kNavigatorCommandBackward), R_ResBackNavActiveSel,
- R_ResBackNavActive, R_ResBackNavInactive);
+ fBack = new BNavigatorButton(
+ BRect(kLeftMargin, top, kLeftMargin + kButtonWidth - 1,
+ top + kButtonWidth - 2),
+ "Back", new BMessage(kNavigatorCommandBackward),
+ R_ResBackNavActiveSel, R_ResBackNavActive,
R_ResBackNavInactive);
fBack->SetEnabled(false);
AddChild(fBack);
- fForw = new BNavigatorButton(BRect(35, top, 53, top + 17), "Forw",
- new BMessage(kNavigatorCommandForward), R_ResForwNavActiveSel,
- R_ResForwNavActive, R_ResForwNavInactive);
+ fForw = new BNavigatorButton(
+ BRect(kLeftMargin + kButtonSpacing, top,
+ kLeftMargin + kButtonSpacing + kButtonWidth - 1,
+ top + kButtonWidth - 2),
+ "Forw", new BMessage(kNavigatorCommandForward),
+ R_ResForwNavActiveSel, R_ResForwNavActive,
R_ResForwNavInactive);
fForw->SetEnabled(false);
AddChild(fForw);
- fUp = new BNavigatorButton(BRect(67, top, 84, top + 17), "Up",
- new BMessage(kNavigatorCommandUp), R_ResUpNavActiveSel,
+ fUp = new BNavigatorButton(
+ BRect(kLeftMargin + kButtonSpacing * 2, top,
+ kLeftMargin + kButtonSpacing * 2 + kButtonWidth - 1,
+ top + kButtonWidth - 2),
+ "Up", new BMessage(kNavigatorCommandUp), R_ResUpNavActiveSel,
R_ResUpNavActive, R_ResUpNavInactive);
fUp->SetEnabled(false);
AddChild(fUp);
- fLocation = new BTextControl(BRect(97, 2, rect.Width() - 2, 21),
+ fLocation = new BTextControl(
+ BRect(kLeftMargin + kButtonSpacing * 3, 2,
+ rect.Width() - 2, 2 + kButtonWidth),
"Location", "", "", new BMessage(kNavigatorCommandLocation),
B_FOLLOW_LEFT_RIGHT);
fLocation->SetDivider(0);
diff --git a/src/kits/tracker/TrackerIcons.rdef
b/src/kits/tracker/TrackerIcons.rdef
index 755a71a..a2225c5 100644
--- a/src/kits/tracker/TrackerIcons.rdef
+++ b/src/kits/tracker/TrackerIcons.rdef
@@ -2515,182 +2515,254 @@ resource(R_TrashStatusBitmap) archive(, 0x00000000)
BBitmap {
resource(R_ResBackNavActive) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 18.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFF3B3B18FFFF"
-
$"FFFFFFFFFFFFFF3FFFFFFFFFFFFF3B353B1418FFFFFFFFFFFFFFFF3FFFFFFFFF"
-
$"FF3B35353B1418FFFFFFFFFFFFFFFF3FFFFFFFFF3B3435353B3B3B3B3B3B3B3B"
-
$"18FFFF3FFFFFFF3B34343535363637373737373B1418FF3FFFFF3B3434343535"
-
$"363637373737373B1418FF3FFF3B343434353536363637373737373B1418FF3F"
-
$"FF183B3535353536363637373737373B1418FF3FFFFF183B3536363636373737"
-
$"3737373B1418FF3FFFFFFF183B3636373B3B3B3B3B3B3B3B1418FF3FFFFFFFFF"
-
$"183B37373B141414141414141418FF3FFFFFFFFFFF183B373B14181818181818"
-
$"18FFFF3FFFFFFFFFFFFF183B3B1418FFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFF18"
-
$"141418FFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF1818FFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF3B3B18FFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFF3B353B1418FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFF3B35353B1418FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFF3B3435353B3B3B3B3B3B3B3B18FFFF3F"
+ $"FFFFFF3B34343535363637373737373B1418FF3F"
+ $"FFFF3B3434343535363637373737373B1418FF3F"
+ $"FF3B343434353536363637373737373B1418FF3F"
+ $"FF183B3535353536363637373737373B1418FF3F"
+ $"FFFF183B35363636363737373737373B1418FF3F"
+ $"FFFFFF183B3636373B3B3B3B3B3B3B3B1418FF3F"
+ $"FFFFFFFF183B37373B141414141414141418FF3F"
+ $"FFFFFFFFFF183B373B1418181818181818FFFF3F"
+ $"FFFFFFFFFFFF183B3B1418FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF18141418FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF1818FFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
resource(R_ResBackNavInactive) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 18.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFF0000FFFFFF"
-
$"FFFFFFFFFFFFFF3FFFFFFFFFFFFF001800FFFFFFFFFFFFFFFFFFFF3FFFFFFFFF"
-
$"FF00181800FFFFFFFFFFFFFFFFFFFF3FFFFFFFFF001C18180000000000000000"
-
$"FFFFFF3FFFFFFF001C1C18181515111111111100FFFFFF3FFFFF001C1C1C1818"
-
$"1515111111111100FFFFFF3FFF001C1C1C1818151515111111111100FFFFFF3F"
-
$"FFFF0018181818151515111111111100FFFFFF3FFFFFFF001815151515111111"
-
$"11111100FFFFFF3FFFFFFFFF001515110000000000000000FFFFFF3FFFFFFFFF"
-
$"FF00111100FFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFF001100FFFFFFFFFFFFFF"
-
$"FFFFFF3FFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF"
-
$"FFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFF001800FFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFF00181800FFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFF001C18180000000000000000FFFFFF3F"
+ $"FFFFFF001C1C18181515111111111100FFFFFF3F"
+ $"FFFF001C1C1C18181515111111111100FFFFFF3F"
+ $"FF001C1C1C1818151515111111111100FFFFFF3F"
+ $"FFFF0018181818151515111111111100FFFFFF3F"
+ $"FFFFFF00181515151511111111111100FFFFFF3F"
+ $"FFFFFFFF001515110000000000000000FFFFFF3F"
+ $"FFFFFFFFFF00111100FFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFF001100FFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
resource(R_ResForwNavActive) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 18.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF3B3B18FF"
-
$"FFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF3B353B18FFFFFFFFFFFFFF3FFFFFFFFF"
-
$"FFFFFFFF3B35363B18FFFFFFFFFFFF3FFF3B3B3B3B3B3B3B3B3536363B18FFFF"
-
$"FFFFFF3FFF3B34343434353535363636373B18FFFFFFFF3FFF3B343434353535"
-
$"3536363637373B18FFFFFF3FFF3B343435353535363636373737373B18FFFF3F"
-
$"FF3B3535353535363636373737373B141418FF3FFF3B35353536363636373737"
-
$"373B141418FFFF3FFF3B3B3B3B3B3B3B3B3737373B141418FFFFFF3FFF181414"
-
$"141414143B37373B141418FFFFFFFF3FFFFF1818181818183B373B141418FFFF"
-
$"FFFFFF3FFFFFFFFFFFFFFFFF3B3B141418FFFFFFFFFFFF3FFFFFFFFFFFFFFFFF"
-
$"18141418FFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFF1818FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF3B3B18FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF3B353B18FFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF3B35363B18FFFFFFFFFFFF3F"
+ $"FF3B3B3B3B3B3B3B3B3536363B18FFFFFFFFFF3F"
+ $"FF3B34343434353535363636373B18FFFFFFFF3F"
+ $"FF3B3434343535353536363637373B18FFFFFF3F"
+ $"FF3B343435353535363636373737373B18FFFF3F"
+ $"FF3B3535353535363636373737373B141418FF3F"
+ $"FF3B35353536363636373737373B141418FFFF3F"
+ $"FF3B3B3B3B3B3B3B3B3737373B141418FFFFFF3F"
+ $"FF181414141414143B37373B141418FFFFFFFF3F"
+ $"FFFF1818181818183B373B141418FFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF3B3B141418FFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF18141418FFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFF1818FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
resource(R_ResForwNavInactive) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 18.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF0000FFFF"
-
$"FFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF001800FFFFFFFFFFFFFFFF3FFFFFFFFF"
-
$"FFFFFFFF00181500FFFFFFFFFFFFFF3FFF000000000000000018151500FFFFFF"
-
$"FFFFFF3FFF001C1C1C1C1818181515151100FFFFFFFFFF3FFF001C1C1C181818"
-
$"18151515111100FFFFFFFF3FFF001C1C181818181515151111111100FFFFFF3F"
-
$"FF0018181818181515151111111100FFFFFFFF3FFF0018181815151515111111"
-
$"1100FFFFFFFFFF3FFF000000000000000011111100FFFFFFFFFFFF3FFFFFFFFF"
-
$"FFFFFFFF00111100FFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF001100FFFFFFFFFF"
-
$"FFFFFF3FFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF"
-
$"FFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF001800FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF00181500FFFFFFFFFFFFFF3F"
+ $"FF000000000000000018151500FFFFFFFFFFFF3F"
+ $"FF001C1C1C1C1818181515151100FFFFFFFFFF3F"
+ $"FF001C1C1C18181818151515111100FFFFFFFF3F"
+ $"FF001C1C181818181515151111111100FFFFFF3F"
+ $"FF0018181818181515151111111100FFFFFFFF3F"
+ $"FF00181818151515151111111100FFFFFFFFFF3F"
+ $"FF000000000000000011111100FFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF00111100FFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF001100FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
resource(R_ResUpNavActive) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 17.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3FFFFFFFFFFFFFFFFF00FFFFFF"
-
$"FFFFFFFFFFFF3F3FFFFFFFFFFFFFFF00E50018FFFFFFFFFFFFFF3F3FFFFFFFFF"
-
$"FFFF00E5BDBD0018FFFFFFFFFFFF3F3FFFFFFFFFFF00E5BDBDBDBD0018FFFFFF"
-
$"FFFF3F3FFFFFFFFF00E5BDBDBDBDBDBD0018FFFFFFFF3F3FFFFFFF00E5BDBDBD"
-
$"BDBDBDBDBD0018FFFFFF3F3FFFFF00E5E5E5BDBDBDBDBD9898980018FFFF3F3F"
-
$"FF00000000E5BDBDBDBDBD980000000018FF3F3FFFFF141400E5BDBDBDBDBD98"
-
$"00141418FFFF3F3FFFFFFF1800E5BDBDBDBDBD98001418FFFFFF3F3FFFFFFFFF"
-
$"00E5BDBDBDBDBD98001418FFFFFF3F3FFFFFFFFF00E5989898989898001418FF"
-
$"FFFF3F3FFFFFFFFF0000000000000000001418FFFFFF3F3FFFFFFFFF18141414"
-
$"141414141418FFFFFFFF3F3FFFFFFFFFFF181818181818181818FFFFFFFF3F3F"
- $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF00E50018FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFF00E5BDBD0018FFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFF00E5BDBDBDBD0018FFFFFFFFFFFF3F"
+ $"FFFFFFFF00E5BDBDBDBDBDBD0018FFFFFFFFFF3F"
+ $"FFFFFF00E5BDBDBDBDBDBDBDBD0018FFFFFFFF3F"
+ $"FFFF00E5E5E5BDBDBDBDBD9898980018FFFFFF3F"
+ $"FF00000000E5BDBDBDBDBD980000000018FFFF3F"
+ $"FFFF141400E5BDBDBDBDBD9800141418FFFFFF3F"
+ $"FFFFFF1800E5BDBDBDBDBD98001418FFFFFFFF3F"
+ $"FFFFFFFF00E5BDBDBDBDBD98001418FFFFFFFF3F"
+ $"FFFFFFFF00E5989898989898001418FFFFFFFF3F"
+ $"FFFFFFFF0000000000000000001418FFFFFFFF3F"
+ $"FFFFFFFF18141414141414141418FFFFFFFFFF3F"
+ $"FFFFFFFFFF181818181818181818FFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
resource(R_ResUpNavInactive) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 17.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3FFFFFFFFFFFFFFFFF00FFFFFF"
-
$"FFFFFFFFFFFF3F3FFFFFFFFFFFFFFF001C00FFFFFFFFFFFFFFFF3F3FFFFFFFFF"
-
$"FFFF001C171700FFFFFFFFFFFFFF3F3FFFFFFFFFFF001C1717171700FFFFFFFF"
-
$"FFFF3F3FFFFFFFFF001C17171717171700FFFFFFFFFF3F3FFFFFFF001C171717"
-
$"171717171700FFFFFFFF3F3FFFFF001C1C1C171717171712121200FFFFFF3F3F"
-
$"FF000000001C17171717171200000000FFFF3F3FFFFFFFFF001C171717171712"
-
$"00FFFFFFFFFF3F3FFFFFFFFF001C17171717171200FFFFFFFFFF3F3FFFFFFFFF"
-
$"001C17171717171200FFFFFFFFFF3F3FFFFFFFFF001C12121212121200FFFFFF"
-
$"FFFF3F3FFFFFFFFF000000000000000000FFFFFFFFFF3F3FFFFFFFFFFFFFFFFF"
-
$"FFFFFFFFFFFFFFFFFFFF3F3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3F"
- $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF001C00FFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFF001C171700FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFF001C1717171700FFFFFFFFFFFFFF3F"
+ $"FFFFFFFF001C17171717171700FFFFFFFFFFFF3F"
+ $"FFFFFF001C171717171717171700FFFFFFFFFF3F"
+ $"FFFF001C1C1C171717171712121200FFFFFFFF3F"
+ $"FF000000001C17171717171200000000FFFFFF3F"
+ $"FFFFFFFF001C17171717171200FFFFFFFFFFFF3F"
+ $"FFFFFFFF001C17171717171200FFFFFFFFFFFF3F"
+ $"FFFFFFFF001C17171717171200FFFFFFFFFFFF3F"
+ $"FFFFFFFF001C12121212121200FFFFFFFFFFFF3F"
+ $"FFFFFFFF000000000000000000FFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
resource(R_ResBackNavActiveSel) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 18.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFF3B3BFFFFFF"
-
$"FFFFFFFFFFFFFF3FFFFFFFFFFFFF3B353BFFFFFFFFFFFFFFFFFFFF3FFFFFFFFF"
-
$"FF3B35353BFFFFFFFFFFFFFFFFFFFF3FFFFFFFFF3B3435353B3B3B3B3B3B3B3B"
-
$"FFFFFF3FFFFFFF3B34343535363637373737373BFFFFFF3FFFFF3B3434343535"
-
$"363637373737373BFFFFFF3FFF3B343434353536363637373737373BFFFFFF3F"
-
$"FFFF3B3535353536363637373737373BFFFFFF3FFFFFFF3B3536363636373737"
-
$"3737373BFFFFFF3FFFFFFFFF3B3636373B3B3B3B3B3B3B3BFFFFFF3FFFFFFFFF"
-
$"FF3B37373BFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFF3B373BFFFFFFFFFFFFFF"
-
$"FFFFFF3FFFFFFFFFFFFFFF3B3BFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF"
-
$"FFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF3B3BFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF3B353BFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFF3B35353BFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFF3B3435353B3B3B3B3B3B3B3BFFFF3F"
+ $"FFFFFFFF3B34343535363637373737373BFFFF3F"
+ $"FFFFFF3B3434343535363637373737373BFFFF3F"
+ $"FFFF3B343434353536363637373737373BFFFF3F"
+ $"FFFFFF3B3535353536363637373737373BFFFF3F"
+ $"FFFFFFFF3B35363636363737373737373BFFFF3F"
+ $"FFFFFFFFFF3B3636373B3B3B3B3B3B3B3BFFFF3F"
+ $"FFFFFFFFFFFF3B37373BFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF3B373BFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF3B3BFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
resource(R_ResForwNavActiveSel) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 18.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF3B3BFFFF"
-
$"FFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF3B353BFFFFFFFFFFFFFFFF3FFFFFFFFF"
-
$"FFFFFFFF3B35363BFFFFFFFFFFFFFF3FFF3B3B3B3B3B3B3B3B3536363BFFFFFF"
-
$"FFFFFF3FFF3B34343434353535363636373BFFFFFFFFFF3FFF3B343434353535"
-
$"3536363637373BFFFFFFFF3FFF3B343435353535363636373737373BFFFFFF3F"
-
$"FF3B3535353535363636373737373BFFFFFFFF3FFF3B35353536363636373737"
-
$"373BFFFFFFFFFF3FFF3B3B3B3B3B3B3B3B3737373BFFFFFFFFFFFF3FFFFFFFFF"
-
$"FFFFFFFF3B37373BFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF3B373BFFFFFFFFFF"
-
$"FFFFFF3FFFFFFFFFFFFFFFFF3B3BFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFF"
-
$"FFFFFFFFFFFFFFFFFFFFFF3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFF3B3BFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFF3B353BFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFF3B35363BFFFFFFFFFFFF3F"
+ $"FFFF3B3B3B3B3B3B3B3B3536363BFFFFFFFFFF3F"
+ $"FFFF3B34343434353535363636373BFFFFFFFF3F"
+ $"FFFF3B3434343535353536363637373BFFFFFF3F"
+ $"FFFF3B343435353535363636373737373BFFFF3F"
+ $"FFFF3B3535353535363636373737373BFFFFFF3F"
+ $"FFFF3B35353536363636373737373BFFFFFFFF3F"
+ $"FFFF3B3B3B3B3B3B3B3B3737373BFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFF3B37373BFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFF3B373BFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFF3B3BFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
resource(R_ResUpNavActiveSel) archive(, 0x00000000) BBitmap {
- "_frame" = rect { 0.0, 0.0, 17.0, 16.0 },
+ "_frame" = rect { 0.0, 0.0, 18.0, 18.0 },
"_cspace" = 4,
"_bmflags" = 1,
"_rowbytes" = 20,
"_data" = array {
-
$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3FFFFFFFFFFFFFFFFF00FFFFFF"
-
$"FFFFFFFFFFFF3F3FFFFFFFFFFFFFFF00E500FFFFFFFFFFFFFFFF3F3FFFFFFFFF"
-
$"FFFF00E5BDBD00FFFFFFFFFFFFFF3F3FFFFFFFFFFF00E5BDBDBDBD00FFFFFFFF"
-
$"FFFF3F3FFFFFFFFF00E5BDBDBDBDBDBD00FFFFFFFFFF3F3FFFFFFF00E5BDBDBD"
-
$"BDBDBDBDBD00FFFFFFFF3F3FFFFF00E5E5E5BDBDBDBDBD98989800FFFFFF3F3F"
-
$"FF00000000E5BDBDBDBDBD9800000000FFFF3F3FFFFFFFFF00E5BDBDBDBDBD98"
-
$"00FFFFFFFFFF3F3FFFFFFFFF00E5BDBDBDBDBD9800FFFFFFFFFF3F3FFFFFFFFF"
-
$"00E5BDBDBDBDBD9800FFFFFFFFFF3F3FFFFFFFFF00E598989898989800FFFFFF"
-
$"FFFF3F3FFFFFFFFF000000000000000000FFFFFFFFFF3F3FFFFFFFFFFFFFFFFF"
-
$"FFFFFFFFFFFFFFFFFFFF3F3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3F"
- $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFF00E500FFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFF00E5BDBD00FFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFF00E5BDBDBDBD00FFFFFFFFFFFF3F"
+ $"FFFFFFFFFF00E5BDBDBDBDBDBD00FFFFFFFFFF3F"
+ $"FFFFFFFF00E5BDBDBDBDBDBDBDBD00FFFFFFFF3F"
+ $"FFFFFF00E5E5E5BDBDBDBDBD98989800FFFFFF3F"
+ $"FFFF00000000E5BDBDBDBDBD9800000000FFFF3F"
+ $"FFFFFFFFFF00E5BDBDBDBDBD9800FFFFFFFFFF3F"
+ $"FFFFFFFFFF00E5BDBDBDBDBD9800FFFFFFFFFF3F"
+ $"FFFFFFFFFF00E5BDBDBDBDBD9800FFFFFFFFFF3F"
+ $"FFFFFFFFFF00E598989898989800FFFFFFFFFF3F"
+ $"FFFFFFFFFF000000000000000000FFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
+ $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3F"
}
};
############################################################################
Commit: ae7d51b28a8826a1f8330f28dead633d98cc42bd
URL: http://cgit.haiku-os.org/haiku/commit/?id=ae7d51b
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Wed Jul 2 19:39:05 2014 UTC
Tracker: Style fixes to IconCache and Utilities
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/IconCache.cpp b/src/kits/tracker/IconCache.cpp
index d862b92..8ab84fc 100644
--- a/src/kits/tracker/IconCache.cpp
+++ b/src/kits/tracker/IconCache.cpp
@@ -66,6 +66,7 @@ All rights reserved.
#include <Debug.h>
#include <Screen.h>
#include <Volume.h>
+
#include <fs_info.h>
#include "Bitmaps.h"
@@ -74,36 +75,39 @@ All rights reserved.
#include "MimeTypes.h"
#include "Model.h"
-#if DEBUG
-// #define LOG_DISK_HITS
+
+//#if DEBUG
+//# define LOG_DISK_HITS
// the LOG_DISK_HITS define is used to check that the disk is not hit more
// than needed - enable it, open a window with a bunch of poses, force
// it to redraw, shouldn't recache
-// #define LOG_ADD_ITEM
-#endif
+//# define LOG_ADD_ITEM
+//#endif
-// set up a few printing macros to get rid of a ton of debugging ifdefs in the
code
+// set up a few printing macros to get rid of a ton of debugging ifdefs
+// in the code
#ifdef LOG_DISK_HITS
- #define PRINT_DISK_HITS(ARGS) _debugPrintf ARGS
+# define PRINT_DISK_HITS(ARGS) _debugPrintf ARGS
#else
- #define PRINT_DISK_HITS(ARGS) (void)0
+# define PRINT_DISK_HITS(ARGS) (void)0
#endif
#ifdef LOG_ADD_ITEM
- #define PRINT_ADD_ITEM(ARGS) _debugPrintf ARGS
+# define PRINT_ADD_ITEM(ARGS) _debugPrintf ARGS
#else
- #define PRINT_ADD_ITEM(ARGS) (void)0
+# define PRINT_ADD_ITEM(ARGS) (void)0
#endif
#undef NODE_CACHE_ASYNC_DRAWS
IconCacheEntry::IconCacheEntry()
- : fLargeIcon(NULL),
- fMiniIcon(NULL),
- fHilitedLargeIcon(NULL),
- fHilitedMiniIcon(NULL),
- fAliasForIndex(-1)
+ :
+ fLargeIcon(NULL),
+ fHilightedLargeIcon(NULL),
+ fMiniIcon(NULL),
+ fHilightedMiniIcon(NULL),
+ fAliasForIndex(-1)
{
}
@@ -112,16 +116,15 @@ IconCacheEntry::~IconCacheEntry()
{
if (fAliasForIndex < 0) {
delete fLargeIcon;
+ delete fHilightedLargeIcon;
delete fMiniIcon;
- delete fHilitedLargeIcon;
- delete fHilitedMiniIcon;
+ delete fHilightedMiniIcon;
// clean up a bit to leave the hash table entry in an
initialized state
fLargeIcon = NULL;
+ fHilightedLargeIcon = NULL;
fMiniIcon = NULL;
- fHilitedLargeIcon = NULL;
- fHilitedMiniIcon = NULL;
-
+ fHilightedMiniIcon = NULL;
}
fAliasForIndex = -1;
}
@@ -147,7 +150,7 @@ IconCacheEntry*
IconCacheEntry::ResolveIfAlias(const SharedIconCache* sharedCache,
IconCacheEntry* entry)
{
- if (!entry)
+ if (entry == NULL)
return NULL;
return sharedCache->ResolveIfAlias(entry);
@@ -157,9 +160,10 @@ IconCacheEntry::ResolveIfAlias(const SharedIconCache*
sharedCache,
bool
IconCacheEntry::CanConstructBitmap(IconDrawMode mode, icon_size) const
{
- if (mode == kSelected)
+ if (mode == kSelected) {
// for now only
return true;
+ }
return false;
}
@@ -172,18 +176,15 @@ IconCacheEntry::HaveIconBitmap(IconDrawMode mode,
icon_size size) const
// for now only
if (mode == kNormalIcon) {
- if (size == B_MINI_ICON)
- return fMiniIcon != NULL;
- else
- return fLargeIcon != NULL
+ return size == B_MINI_ICON ? fMiniIcon != NULL
+ : fLargeIcon != NULL
&& fLargeIcon->Bounds().IntegerWidth() + 1 ==
size;
} else if (mode == kSelected) {
- if (size == B_MINI_ICON)
- return fHilitedMiniIcon != NULL;
- else
- return fHilitedLargeIcon != NULL
- && fHilitedLargeIcon->Bounds().IntegerWidth() +
1 == size;
+ return size == B_MINI_ICON ? fHilightedMiniIcon != NULL
+ : fHilightedLargeIcon != NULL
+ && fHilightedLargeIcon->Bounds().IntegerWidth()
+ 1 == size;
}
+
return false;
}
@@ -201,24 +202,26 @@ IconCacheEntry::IconForMode(IconDrawMode mode, icon_size
size) const
return fLargeIcon;
} else if (mode == kSelected) {
if (size == B_MINI_ICON)
- return fHilitedMiniIcon;
+ return fHilightedMiniIcon;
else
- return fHilitedLargeIcon;
+ return fHilightedLargeIcon;
}
+
return NULL;
}
bool
-IconCacheEntry::IconHitTest(BPoint where, IconDrawMode mode, icon_size size)
const
+IconCacheEntry::IconHitTest(BPoint where, IconDrawMode mode,
+ icon_size size) const
{
ASSERT(where.x < size && where.y < size);
BBitmap* bitmap = IconForMode(mode, size);
- if (!bitmap)
+ if (bitmap == NULL)
return false;
uchar* bits = (uchar*)bitmap->Bits();
- ASSERT(bits);
+ ASSERT(bits != NULL);
BRect bounds(bitmap->Bounds());
bounds.InsetBy((bounds.Width() + 1.0) / 8.0, (bounds.Height() + 1.0) /
8.0);
@@ -263,7 +266,8 @@ IconCacheEntry::ConstructBitmap(IconDrawMode requestedMode,
icon_size size,
LazyBitmapAllocator* lazyBitmap)
{
BBitmap* source = (size == B_MINI_ICON) ? fMiniIcon : fLargeIcon;
- ASSERT(source);
+ ASSERT(source != NULL);
+
return ConstructBitmap(source, requestedMode, kNormalIcon, size,
lazyBitmap);
}
@@ -273,11 +277,12 @@ bool
IconCacheEntry::AlternateModeForIconConstructing(IconDrawMode requestedMode,
IconDrawMode &alternate, icon_size)
{
- if (requestedMode & kSelected) {
+ if ((requestedMode & kSelected) != 0) {
// for now
alternate = kNormalIcon;
return true;
}
+
return false;
}
@@ -293,18 +298,19 @@ IconCacheEntry::SetIcon(BBitmap* bitmap, IconDrawMode
mode, icon_size size,
fLargeIcon = bitmap;
} else if (mode == kSelectedIcon) {
if (size == B_MINI_ICON)
- fHilitedMiniIcon = bitmap;
+ fHilightedMiniIcon = bitmap;
else
- fHilitedLargeIcon = bitmap;
+ fHilightedLargeIcon = bitmap;
} else
TRESPASS();
}
IconCache::IconCache()
- : fInitHiliteTable(true)
+ :
+ fInitHighlightTable(true)
{
- InitHiliteTable();
+ InitHighlightTable();
}
@@ -314,7 +320,9 @@ IconCache::IconCache()
// icon in each of the locations, if we get a hit, we look for the
// specialized, if we don't find one, we try to auto-construct one, if we
// can't we assume the icon is not available for now the code only looks for
-// normal icons, selected icons are auto-generated
+// normal icons, selected icons are auto-generated.
+
+
IconCacheEntry*
IconCache::GetIconForPreferredApp(const char* fileTypeSignature,
const char* preferredApp, IconDrawMode mode, icon_size size,
@@ -322,12 +330,12 @@ IconCache::GetIconForPreferredApp(const char*
fileTypeSignature,
{
ASSERT(fSharedCache.IsLocked());
- if (!preferredApp[0])
+ if (preferredApp == NULL || *preferredApp == '\0')
return NULL;
- if (!entry) {
+ if (entry == NULL) {
entry = fSharedCache.FindItem(fileTypeSignature, preferredApp);
- if (entry) {
+ if (entry != NULL) {
entry = entry->ResolveIfAlias(&fSharedCache, entry);
#if xDEBUG
PRINT(("File %s; Line %d # looking for %s, type %s,
found %x\n",
@@ -338,8 +346,7 @@ IconCache::GetIconForPreferredApp(const char*
fileTypeSignature,
}
}
- if (!entry || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
-
+ if (entry == NULL || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
PRINT_DISK_HITS(
("File %s; Line %d # hitting disk for preferredApp %s,
type %s\n",
__FILE__, __LINE__, preferredApp, fileTypeSignature));
@@ -353,7 +360,7 @@ IconCache::GetIconForPreferredApp(const char*
fileTypeSignature,
}
BBitmap* bitmap = lazyBitmap->Adopt();
- if (!entry) {
+ if (entry == NULL) {
PRINT_ADD_ITEM(
("File %s; Line %d # adding entry for
preferredApp %s, "
"type %s\n", __FILE__, __LINE__, preferredApp,
@@ -379,17 +386,17 @@ IconCache::GetIconFromMetaMime(const char* fileType,
IconDrawMode mode,
{
ASSERT(fSharedCache.IsLocked());
- if (!entry)
+ if (entry == NULL)
entry = fSharedCache.FindItem(fileType);
- if (entry) {
+ if (entry != NULL) {
entry = entry->ResolveIfAlias(&fSharedCache, entry);
// metamime defines an icon and we have it cached
if (entry->HaveIconBitmap(mode, size))
return entry;
}
- if (!entry || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
+ if (entry == NULL || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
PRINT_DISK_HITS(("File %s; Line %d # hitting disk for metamime
%s\n",
__FILE__, __LINE__, fileType));
@@ -402,7 +409,7 @@ IconCache::GetIconFromMetaMime(const char* fileType,
IconDrawMode mode,
return NULL;
SharedCacheEntry* aliasTo = NULL;
- if (entry) {
+ if (entry != NULL) {
aliasTo
=
(SharedCacheEntry*)entry->ResolveIfAlias(&fSharedCache);
}
@@ -416,7 +423,7 @@ IconCache::GetIconFromMetaMime(const char* fileType,
IconDrawMode mode,
// make an aliased entry so that the next time we get a
// hit on the first FindItem in here
- if (!entry) {
+ if (entry == NULL) {
PRINT_ADD_ITEM(
("File %s; Line %d # adding entry as
alias for type %s\n",
__FILE__, __LINE__, fileType));
@@ -429,7 +436,7 @@ IconCache::GetIconFromMetaMime(const char* fileType,
IconDrawMode mode,
// at this point, we've found an icon for the MIME type
BBitmap* bitmap = lazyBitmap->Adopt();
- if (!entry) {
+ if (entry == NULL) {
PRINT_ADD_ITEM(("File %s; Line %d # adding entry for
type %s\n",
__FILE__, __LINE__, fileType));
entry = fSharedCache.AddItem(fileType);
@@ -437,7 +444,8 @@ IconCache::GetIconFromMetaMime(const char* fileType,
IconDrawMode mode,
entry->SetIcon(bitmap, kNormalIcon, size);
}
- ASSERT(entry);
+ ASSERT(entry != NULL);
+
if (mode != kNormalIcon
&& entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
entry->ConstructBitmap(mode, size, lazyBitmap);
@@ -450,6 +458,7 @@ IconCache::GetIconFromMetaMime(const char* fileType,
IconDrawMode mode,
#endif
ASSERT(entry->HaveIconBitmap(mode, size));
+
return entry;
}
@@ -467,7 +476,6 @@ IconCache::GetIconFromFileTypes(ModelNodeLazyOpener*
modelOpener,
const char* nodePreferredApp = model->PreferredAppSignature();
if (source == kUnknownSource || source == kUnknownNotFromNode
|| source == kPreferredAppForNode) {
-
if (nodePreferredApp[0]) {
// file has a locally set preferred app, try getting an
icon from
// there
@@ -477,9 +485,10 @@ IconCache::GetIconFromFileTypes(ModelNodeLazyOpener*
modelOpener,
PRINT(("File %s; Line %d # looking for %s, type %s,
found %x\n",
__FILE__, __LINE__, nodePreferredApp, fileType,
entry));
#endif
- if (entry) {
+ if (entry != NULL) {
source = kPreferredAppForNode;
ASSERT(entry->HaveIconBitmap(mode, size));
+
return entry;
}
}
@@ -488,27 +497,29 @@ IconCache::GetIconFromFileTypes(ModelNodeLazyOpener*
modelOpener,
}
entry = GetIconFromMetaMime(fileType, mode, size, lazyBitmap, entry);
- if (!entry) {
+ if (entry == NULL) {
// Try getting a supertype handler icon
BMimeType mime(fileType);
if (!mime.IsSupertypeOnly()) {
BMimeType superType;
mime.GetSupertype(&superType);
const char* superTypeFileType = superType.Type();
- if (superTypeFileType)
+ if (superTypeFileType != NULL) {
entry = GetIconFromMetaMime(superTypeFileType,
mode, size,
lazyBitmap, entry);
+ }
#if DEBUG
- else
- PRINT(
- ("File %s; Line %d # failed to get
supertype for "
- "type %s\n", __FILE__, __LINE__,
fileType));
+ else {
+ PRINT(("File %s; Line %d # failed to get
supertype for "
+ "type %s\n", __FILE__, __LINE__,
fileType));
+ }
#endif
}
}
- ASSERT(!entry || entry->HaveIconBitmap(mode, size));
- if (entry) {
- if (nodePreferredApp[0]) {
+
+ ASSERT(entry == NULL || entry->HaveIconBitmap(mode, size));
+ if (entry != NULL) {
+ if (nodePreferredApp != NULL && *nodePreferredApp != '\0') {
// we got a miss using GetIconForPreferredApp before,
cache this
// fileType/preferredApp combo with an aliased entry
@@ -531,12 +542,14 @@ IconCache::GetIconFromFileTypes(ModelNodeLazyOpener*
modelOpener,
// GetIconForPreferredApp
} else
source = kMetaMime;
+
#if DEBUG
if (!entry->HaveIconBitmap(mode, size))
model->PrintToStream();
#endif
ASSERT(entry->HaveIconBitmap(mode, size));
}
+
return entry;
}
@@ -554,7 +567,7 @@
IconCache::GetVolumeIcon(AutoLock<SimpleIconCache>*nodeCacheLocker,
if (source != kUnknownSource) {
// cached in the node cache
entry = fNodeCache.FindItem(model->NodeRef());
- if (entry) {
+ if (entry != NULL) {
entry = IconCacheEntry::ResolveIfAlias(&fSharedCache,
entry);
if (source == kTrackerDefault) {
@@ -572,14 +585,14 @@
IconCache::GetVolumeIcon(AutoLock<SimpleIconCache>*nodeCacheLocker,
// try getting using the BVolume::GetIcon call; if miss,
// go for the default mime based icon
- if (!entry || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
+ if (entry == NULL || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
BVolume volume(model->NodeRef()->device);
if (volume.IsShared()) {
- // Check if it's a network share and give it a special
icon
+ // check if it's a network share and give it a special
icon
BBitmap* bitmap = lazyBitmap->Get();
GetTrackerResources()->GetIconResource(R_ShareIcon,
size, bitmap);
- if (!entry) {
+ if (entry == NULL) {
PRINT_ADD_ITEM(
("File %s; Line %d # adding entry for
model %s\n",
__FILE__, __LINE__, model->Name()));
@@ -587,34 +600,33 @@
IconCache::GetVolumeIcon(AutoLock<SimpleIconCache>*nodeCacheLocker,
}
entry->SetIcon(lazyBitmap->Adopt(), kNormalIcon, size);
} else if (volume.GetIcon(lazyBitmap->Get(), size) == B_OK) {
- // Ask the device for an icon
+ // ask the device for an icon
BBitmap* bitmap = lazyBitmap->Adopt();
- ASSERT(bitmap);
- if (!entry) {
+ ASSERT(bitmap != NULL);
+ if (entry == NULL) {
PRINT_ADD_ITEM(
("File %s; Line %d # adding entry for
model %s\n",
__FILE__, __LINE__, model->Name()));
entry = fNodeCache.AddItem(model->NodeRef());
}
- ASSERT(entry);
+ ASSERT(entry != NULL);
entry->SetIcon(bitmap, kNormalIcon, size);
source = kVolume;
} else {
*resultingOpenCache = sharedCacheLocker;
sharedCacheLocker->Lock();
- // If the volume doesnt have a device it should have
- // the generic icon
+ // if the volume doesnt have a device it gets the
generic icon
entry = GetIconFromMetaMime(B_VOLUME_MIMETYPE, mode,
size, lazyBitmap, entry);
}
}
- if (mode != kNormalIcon
- && entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
+ if (mode != kNormalIcon && entry->HaveIconBitmap(NORMAL_ICON_ONLY,
size)) {
entry->ConstructBitmap(mode, size, lazyBitmap);
entry->SetIcon(lazyBitmap->Adopt(), mode, size);
}
+
return entry;
}
@@ -630,6 +642,7 @@ IconCache::GetRootIcon(AutoLock<SimpleIconCache>*,
(*resultingOpenCache)->Lock();
source = kTrackerSupplied;
+
return GetIconFromMetaMime(B_ROOT_MIMETYPE, mode, size, lazyBitmap, 0);
}
@@ -643,7 +656,7 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache>*,
{
const WellKnowEntryList::WellKnownEntry* wellKnownEntry
= WellKnowEntryList::MatchEntry(model->NodeRef());
- if (!wellKnownEntry)
+ if (wellKnownEntry == NULL)
return NULL;
IconCacheEntry* entry = NULL;
@@ -657,72 +670,72 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache>*,
source = kTrackerSupplied;
entry = fSharedCache.FindItem(type.String());
- if (entry) {
+ if (entry != NULL) {
entry = entry->ResolveIfAlias(&fSharedCache, entry);
if (entry->HaveIconBitmap(mode, size))
return entry;
}
- if (!entry || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
+ if (entry == NULL || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
// match up well known entries in the file system with
specialized
// icons stored in Tracker's resources
- int32 resid = -1;
+ int32 resourceId = -1;
switch ((uint32)wellKnownEntry->which) {
case B_BOOT_DISK:
- resid = R_BootVolumeIcon;
+ resourceId = R_BootVolumeIcon;
break;
case B_BEOS_DIRECTORY:
- resid = R_BeosFolderIcon;
+ resourceId = R_BeosFolderIcon;
break;
case B_USER_DIRECTORY:
- resid = R_HomeDirIcon;
+ resourceId = R_HomeDirIcon;
break;
case B_SYSTEM_FONTS_DIRECTORY:
case B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY:
case B_USER_FONTS_DIRECTORY:
case B_USER_NONPACKAGED_FONTS_DIRECTORY:
- resid = R_FontDirIcon;
+ resourceId = R_FontDirIcon;
break;
case B_BEOS_APPS_DIRECTORY:
case B_APPS_DIRECTORY:
case B_USER_DESKBAR_APPS_DIRECTORY:
- resid = R_AppsDirIcon;
+ resourceId = R_AppsDirIcon;
break;
case B_BEOS_PREFERENCES_DIRECTORY:
case B_PREFERENCES_DIRECTORY:
case B_USER_DESKBAR_PREFERENCES_DIRECTORY:
- resid = R_PrefsDirIcon;
+ resourceId = R_PrefsDirIcon;
break;
case B_USER_MAIL_DIRECTORY:
- resid = R_MailDirIcon;
+ resourceId = R_MailDirIcon;
break;
case B_USER_QUERIES_DIRECTORY:
- resid = R_QueryDirIcon;
+ resourceId = R_QueryDirIcon;
break;
case B_SYSTEM_DEVELOP_DIRECTORY:
case B_SYSTEM_NONPACKAGED_DEVELOP_DIRECTORY:
case B_USER_DESKBAR_DEVELOP_DIRECTORY:
- resid = R_DevelopDirIcon;
+ resourceId = R_DevelopDirIcon;
break;
case B_USER_CONFIG_DIRECTORY:
- resid = R_ConfigDirIcon;
+ resourceId = R_ConfigDirIcon;
break;
case B_USER_PEOPLE_DIRECTORY:
- resid = R_PersonDirIcon;
+ resourceId = R_PersonDirIcon;
break;
case B_USER_DOWNLOADS_DIRECTORY:
- resid = R_DownloadDirIcon;
+ resourceId = R_DownloadDirIcon;
break;
default:
@@ -732,7 +745,7 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache>*,
entry = fSharedCache.AddItem(type.String());
BBitmap* bitmap = lazyBitmap->Get();
- GetTrackerResources()->GetIconResource(resid, size, bitmap);
+ GetTrackerResources()->GetIconResource(resourceId, size,
bitmap);
entry->SetIcon(lazyBitmap->Adopt(), kNormalIcon, size);
}
@@ -743,6 +756,7 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache>*,
}
ASSERT(entry->HaveIconBitmap(mode, size));
+
return entry;
}
@@ -751,7 +765,7 @@ IconCacheEntry*
IconCache::GetNodeIcon(ModelNodeLazyOpener* modelOpener,
AutoLock<SimpleIconCache>* nodeCacheLocker,
AutoLock<SimpleIconCache>** resultingOpenCache,
- Model* model, IconSource &source,
+ Model* model, IconSource& source,
IconDrawMode mode, icon_size size,
LazyBitmapAllocator* lazyBitmap, IconCacheEntry* entry, bool permanent)
{
@@ -759,7 +773,7 @@ IconCache::GetNodeIcon(ModelNodeLazyOpener* modelOpener,
(*resultingOpenCache)->Lock();
entry = fNodeCache.FindItem(model->NodeRef());
- if (!entry || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
+ if (entry == NULL || !entry->HaveIconBitmap(NORMAL_ICON_ONLY, size)) {
modelOpener->OpenNode();
BFile* file = NULL;
@@ -773,22 +787,17 @@ IconCache::GetNodeIcon(ModelNodeLazyOpener* modelOpener,
PRINT_DISK_HITS(("File %s; Line %d # hitting disk for node
%s\n",
__FILE__, __LINE__, model->Name()));
- status_t result;
- if (file)
- result = GetAppIconFromAttr(file, lazyBitmap->Get(),
size);
- else {
- result = GetFileIconFromAttr(model->Node(),
lazyBitmap->Get(),
- size);
- }
+ status_t result = file != NULL
+ ? GetAppIconFromAttr(file, lazyBitmap->Get(), size)
+ : GetFileIconFromAttr(model->Node(), lazyBitmap->Get(),
size);
if (result == B_OK) {
- // node has it's own icon, use it
-
+ // node has its own icon, use it
BBitmap* bitmap = lazyBitmap->Adopt();
PRINT_ADD_ITEM(("File %s; Line %d # adding entry for
model %s\n",
__FILE__, __LINE__, model->Name()));
entry = fNodeCache.AddItem(model->NodeRef(), permanent);
- ASSERT(entry);
+ ASSERT(entry != NULL);
entry->SetIcon(bitmap, kNormalIcon, size);
if (mode != kNormalIcon) {
entry->ConstructBitmap(mode, size, lazyBitmap);
@@ -798,7 +807,7 @@ IconCache::GetNodeIcon(ModelNodeLazyOpener* modelOpener,
}
}
- if (!entry) {
+ if (entry == NULL) {
(*resultingOpenCache)->Unlock();
*resultingOpenCache = NULL;
} else if (!entry->HaveIconBitmap(mode, size)
@@ -822,10 +831,8 @@ IconCache::GetGenericIcon(AutoLock<SimpleIconCache>*
sharedCacheLocker,
*resultingOpenCache = sharedCacheLocker;
(*resultingOpenCache)->Lock();
- entry = GetIconFromMetaMime(B_FILE_MIMETYPE, mode,
- size, lazyBitmap, 0);
-
- if (!entry)
+ entry = GetIconFromMetaMime(B_FILE_MIMETYPE, mode, size, lazyBitmap, 0);
+ if (entry == NULL)
return NULL;
// make an aliased entry so that the next time we get a
@@ -842,6 +849,7 @@ IconCache::GetGenericIcon(AutoLock<SimpleIconCache>*
sharedCacheLocker,
source = kMetaMime;
ASSERT(entry->HaveIconBitmap(mode, size));
+
return entry;
}
@@ -868,6 +876,7 @@ IconCache::GetFallbackIcon(AutoLock<SimpleIconCache>*
sharedCacheLocker,
}
ASSERT(entry->HaveIconBitmap(mode, size));
+
return entry;
}
@@ -896,14 +905,12 @@ IconCache::Preload(AutoLock<SimpleIconCache>*
nodeCacheLocker,
IconSource source = model->IconFrom();
if (source == kUnknownSource || source == kUnknownNotFromNode) {
-
// fish for special first models and handle them
appropriately
if (model->IsVolume()) {
// volume may use specialized icon in the
volume node
entry = GetNodeIcon(&modelOpener,
nodeCacheLocker,
&resultingOpenCache, model, source,
mode, size,
&lazyBitmap, entry, permanent);
-
if (entry == NULL ||
!entry->HaveIconBitmap(mode, size)) {
// look for volume defined icon
entry = GetVolumeIcon(nodeCacheLocker,
sharedCacheLocker,
@@ -932,7 +939,6 @@ IconCache::Preload(AutoLock<SimpleIconCache>*
nodeCacheLocker,
entry =
GetIconFromFileTypes(&modelOpener, source, mode,
size, &lazyBitmap, 0);
-
if (entry == NULL) {
// we don't have an icon, go
with the generic
entry =
GetGenericIcon(sharedCacheLocker,
@@ -955,7 +961,6 @@ IconCache::Preload(AutoLock<SimpleIconCache>*
nodeCacheLocker,
entry = GetNodeIcon(&modelOpener,
nodeCacheLocker,
&resultingOpenCache, model,
source, mode,
size, &lazyBitmap, entry,
permanent);
-
if (entry != NULL) {
entry =
IconCacheEntry::ResolveIfAlias(&fSharedCache,
entry);
@@ -977,7 +982,6 @@ IconCache::Preload(AutoLock<SimpleIconCache>*
nodeCacheLocker,
entry =
GetWellKnownIcon(nodeCacheLocker,
sharedCacheLocker,
&resultingOpenCache, model,
source, mode, size,
&lazyBitmap);
-
if (entry != NULL)
break;
}
@@ -1235,15 +1239,15 @@ BBitmap*
IconCache::MakeSelectedIcon(const BBitmap* normal, icon_size size,
LazyBitmapAllocator* lazyBitmap)
{
- return MakeTransformedIcon(normal, size, fHiliteTable, lazyBitmap);
+ return MakeTransformedIcon(normal, size, fHighlightTable, lazyBitmap);
}
-#if xDEBUG
+#if xDEBUG
static void
DumpBitmap(const BBitmap* bitmap)
{
- if (!bitmap){
+ if (bitmap == NULL) {
printf("NULL bitmap passed to DumpBitmap\n");
return;
}
@@ -1263,22 +1267,22 @@ DumpBitmap(const BBitmap* bitmap)
}
printf("\n");
}
-
#endif
+
void
-IconCache::InitHiliteTable()
+IconCache::InitHighlightTable()
{
// build the color transform tables for different icon modes
BScreen screen(B_MAIN_SCREEN_ID);
rgb_color color;
for (int32 index = 0; index < kColorTransformTableSize; index++) {
color = screen.ColorForIndex((uchar)index);
- fHiliteTable[index] = screen.IndexForColor(tint_color(color,
1.3f));
+ fHighlightTable[index] = screen.IndexForColor(tint_color(color,
1.3f));
}
- fHiliteTable[B_TRANSPARENT_8_BIT] = B_TRANSPARENT_8_BIT;
- fInitHiliteTable = false;
+ fHighlightTable[B_TRANSPARENT_8_BIT] = B_TRANSPARENT_8_BIT;
+ fInitHighlightTable = false;
}
@@ -1286,8 +1290,8 @@ BBitmap*
IconCache::MakeTransformedIcon(const BBitmap* source, icon_size /*size*/,
int32 colorTransformTable[], LazyBitmapAllocator* lazyBitmap)
{
- if (fInitHiliteTable)
- InitHiliteTable();
+ if (fInitHighlightTable)
+ InitHighlightTable();
BBitmap* result = lazyBitmap->Get();
uint8* src = (uint8*)source->Bits();
@@ -1368,21 +1372,21 @@ IconCache::IconHitTest(BPoint where, const Model*
model, IconDrawMode mode,
void
IconCacheEntry::RetireIcons(BObjectList<BBitmap>* retiredBitmapList)
{
- if (fLargeIcon) {
+ if (fLargeIcon != NULL) {
retiredBitmapList->AddItem(fLargeIcon);
fLargeIcon = NULL;
}
- if (fMiniIcon) {
+ if (fHilightedLargeIcon != NULL) {
+ retiredBitmapList->AddItem(fHilightedLargeIcon);
+ fHilightedLargeIcon = NULL;
+ }
+ if (fMiniIcon != NULL) {
retiredBitmapList->AddItem(fMiniIcon);
fMiniIcon = NULL;
}
- if (fHilitedLargeIcon) {
- retiredBitmapList->AddItem(fHilitedLargeIcon);
- fHilitedLargeIcon = NULL;
- }
- if (fHilitedMiniIcon) {
- retiredBitmapList->AddItem(fHilitedMiniIcon);
- fHilitedMiniIcon = NULL;
+ if (fHilightedMiniIcon != NULL) {
+ retiredBitmapList->AddItem(fHilightedMiniIcon);
+ fHilightedMiniIcon = NULL;
}
int32 count = retiredBitmapList->CountItems();
@@ -1394,23 +1398,24 @@ IconCacheEntry::RetireIcons(BObjectList<BBitmap>*
retiredBitmapList)
}
-// #pragma mark -
+// #pragma mark - SharedIconCache
// In debug mode keep the hash table sizes small so that they grow a lot and
// execercise the resizing code a lot. In release mode allocate them large
// up-front for better performance
SharedIconCache::SharedIconCache()
+ :
#if DEBUG
- : SimpleIconCache("Shared Icon cache aka \"The Dead-Locker\""),
- fHashTable(20),
- fElementArray(20),
- fRetiredBitmaps(20, true)
+ SimpleIconCache("Shared icon cache aka \"The Dead-Locker\""),
+ fHashTable(20),
+ fElementArray(20),
+ fRetiredBitmaps(20, true)
#else
- : SimpleIconCache("Tracker shared icon cache"),
- fHashTable(1000),
- fElementArray(1024),
- fRetiredBitmaps(256, true)
+ SimpleIconCache("Tracker shared icon cache"),
+ fHashTable(1000),
+ fElementArray(1024),
+ fRetiredBitmaps(256, true)
#endif
{
fHashTable.SetElementVector(&fElementArray);
@@ -1447,7 +1452,7 @@ SharedIconCache::FindItem(const char* fileType,
= fHashTable.FindFirst(SharedCacheEntry::Hash(fileType,
appSignature));
- if (!result)
+ if (result == NULL)
return NULL;
for(;;) {
@@ -1459,8 +1464,8 @@ SharedIconCache::FindItem(const char* fileType,
if (result->fNext < 0)
break;
- result
- =
const_cast<SharedCacheEntry*>(&fElementArray.At(result->fNext));
+ result = const_cast<SharedCacheEntry*>(&fElementArray.At(
+ result->fNext));
}
return NULL;
@@ -1470,13 +1475,14 @@ SharedIconCache::FindItem(const char* fileType,
SharedCacheEntry*
SharedIconCache::AddItem(const char* fileType, const char* appSignature)
{
- ASSERT(fileType);
- if (!fileType)
+ ASSERT(fileType != NULL);
+ if (fileType == NULL)
fileType = B_FILE_MIMETYPE;
SharedCacheEntry* result =
fHashTable.Add(SharedCacheEntry::Hash(fileType,
appSignature));
result->SetTo(fileType, appSignature);
+
return result;
}
@@ -1488,8 +1494,8 @@ SharedIconCache::AddItem(SharedCacheEntry**
outstandingEntry,
int32 entryToken = fHashTable.ElementIndex(*outstandingEntry);
ASSERT(entryToken >= 0);
- ASSERT(fileType);
- if (!fileType)
+ ASSERT(fileType != NULL);
+ if (fileType == NULL)
fileType = B_FILE_MIMETYPE;
SharedCacheEntry* result =
fHashTable.Add(SharedCacheEntry::Hash(fileType,
@@ -1525,24 +1531,26 @@ SharedIconCache::RemoveAliasesTo(int32 aliasIndex)
void
-SharedIconCache::SetAliasFor(IconCacheEntry* alias,
+SharedIconCache::SetAliasFor(IconCacheEntry* entry,
const SharedCacheEntry* original) const
{
- alias->fAliasForIndex = fHashTable.ElementIndex(original);
+ entry->fAliasForIndex = fHashTable.ElementIndex(original);
}
SharedCacheEntry::SharedCacheEntry()
- : fNext(-1)
+ :
+ fNext(-1)
{
}
SharedCacheEntry::SharedCacheEntry(const char* fileType,
const char* appSignature)
- : fNext(-1),
- fFileType(fileType),
- fAppSignature(appSignature)
+ :
+ fNext(-1),
+ fFileType(fileType),
+ fAppSignature(appSignature)
{
}
@@ -1552,7 +1560,7 @@ SharedCacheEntry::Draw(BView* view, BPoint where,
IconDrawMode mode,
icon_size size, bool async)
{
BBitmap* bitmap = IconForMode(mode, size);
- ASSERT(bitmap);
+ ASSERT(bitmap != NULL);
drawing_mode oldMode = view->DrawingMode();
@@ -1561,9 +1569,8 @@ SharedCacheEntry::Draw(BView* view, BPoint where,
IconDrawMode mode,
view->SetDrawingMode(B_OP_ALPHA);
view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
}
- } else {
+ } else
view->SetDrawingMode(B_OP_OVER);
- }
if (async)
view->DrawBitmapAsync(bitmap, where);
@@ -1580,16 +1587,9 @@ SharedCacheEntry::Draw(BView* view, BPoint where,
IconDrawMode mode,
void* passThruState)
{
BBitmap* bitmap = IconForMode(mode, size);
- if (!bitmap)
+ if (bitmap == NULL)
return;
-// if (bitmap->ColorSpace() == B_RGBA32) {
-// view->SetDrawingMode(B_OP_ALPHA);
-// view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
-// } else {
-// view->SetDrawingMode(B_OP_OVER);
-// }
-
(blitFunc)(view, where, bitmap, passThruState);
}
@@ -1598,7 +1598,7 @@ uint32
SharedCacheEntry::Hash(const char* fileType, const char* appSignature)
[ *** diff truncated: 707 lines dropped *** ]
############################################################################
Commit: c2d07d9988d5a9e179ee4ceb535e8345ed1f8c44
URL: http://cgit.haiku-os.org/haiku/commit/?id=c2d07d9
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Jun 26 23:47:31 2014 UTC
Tracker: yet more style fixes
----------------------------------------------------------------------------
############################################################################
Commit: dd3359ae8f0c46f52aaa68d0aea0d7d9d80f8525
URL: http://cgit.haiku-os.org/haiku/commit/?id=dd3359a
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jun 27 02:55:14 2014 UTC
Tracker: return B_BAD_VALUE if you pass in a NULL dir
----------------------------------------------------------------------------
############################################################################
Commit: 7f68dcb4a7fcc19d7dc493963197a587fb82b423
URL: http://cgit.haiku-os.org/haiku/commit/?id=7f68dcb
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jun 27 05:18:39 2014 UTC
Tracker: Write Desktop icon attrs only once
----------------------------------------------------------------------------
############################################################################
Commit: 537e1fff3e9f4aa63856474502642de0a48f2b81
URL: http://cgit.haiku-os.org/haiku/commit/?id=537e1ff
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jun 27 05:24:26 2014 UTC
Tracker: Write Trash icon attrs only once
Also create Trash if does not exist but check the if the icon
attrs are set separately.
Only set the vector trash icon #ifdef __HAIKU__ does this
even matter anymore?
----------------------------------------------------------------------------
############################################################################
Commit: 8b9604572e887b4152810b97f9957421d7327dd8
URL: http://cgit.haiku-os.org/haiku/commit/?id=8b96045
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jun 27 18:54:41 2014 UTC
Tracker: style fixes to ContainerWindow
----------------------------------------------------------------------------
############################################################################
Commit: 670b729d652f73f142e4ad6c94ee9958a73223ef
URL: http://cgit.haiku-os.org/haiku/commit/?id=670b729
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Wed Jun 25 23:20:49 2014 UTC
Tracker: style fixe, update comment, spelling
...and fits on 1 line
----------------------------------------------------------------------------
############################################################################
Commit: 8e5c1f2394139bf1d677e884bbac86fb08a6adaa
URL: http://cgit.haiku-os.org/haiku/commit/?id=8e5c1f2
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Wed Jun 25 22:56:41 2014 UTC
Tracker: style, reorder includes in DeskWindow.cpp
----------------------------------------------------------------------------
############################################################################
Commit: e8c8f8536cbe5870d2ab401c8b2e3cb553956b67
URL: http://cgit.haiku-os.org/haiku/commit/?id=e8c8f85
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Jul 15 00:30:29 2014 UTC
Storage Kit: Style fixes to database_support.h
----------------------------------------------------------------------------
############################################################################
Commit: 9bbfee0fd545c4971e6649864d4aa4d3685f338c
URL: http://cgit.haiku-os.org/haiku/commit/?id=9bbfee0
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Jul 8 16:56:41 2014 UTC
BNodeInfo: Style fixes
* Remove public method docs, they are in Haiku Book only.
* Format private method docs as doxygen.
* Other style fixes like explicit NULL checks.
* Remove dead code in GetIcon() that isn't coming back.
* Pointer style.
----------------------------------------------------------------------------
############################################################################
Commit: bcd81d91f0fa3a852f5faa066cf86734a418755f
URL: http://cgit.haiku-os.org/haiku/commit/?id=bcd81d9
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Jul 8 21:41:27 2014 UTC
IconUtils: Style fixes
* Mostly just renaming variables for clarity and consistency
* whitespace
* fill out #pragma mark's
* indentation
----------------------------------------------------------------------------
############################################################################
Commit: 3f2239f6b6f18767f6e35ecdc9ea9d447a4f8661
URL: http://cgit.haiku-os.org/haiku/commit/?id=3f2239f
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Jul 8 22:30:35 2014 UTC
Storage Kit: Style fixes to mime database
* Update doxygen docs a bit, especially returns.
* Some variable renaming for consistency and clarity, err/error => result.
* Remove some dead code that isn't coming back. (code moved to IconUtils)
* OpenType() returns a status_t, put it in a status_t, not a ssize_t.
and then later create a new ssize_t to hold the read bytes read
and use that, saves a lot of casting and confusion.
----------------------------------------------------------------------------
############################################################################
Commit: 3a7f3317ce708b27201c876192e3dbe3c953cebe
URL: http://cgit.haiku-os.org/haiku/commit/?id=3a7f331
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Jul 15 04:52:32 2014 UTC
IconUtils: Improved error checking
----------------------------------------------------------------------------
############################################################################
Revision: hrev47513
Commit: 9f2a3f6f47d121411c85a1e939f1cda80a4b4b1d
URL: http://cgit.haiku-os.org/haiku/commit/?id=9f2a3f6
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jun 27 18:53:39 2014 UTC
Tracker: Move opening Desktop window to constructor
BRoster::Launch() sends B_REFS_RECEIVED before B_READY_TO_RUN
if the application is not running, so, when B_REFS_RECEIVED looked for
the Desktop window it wasn't created yet since that happen in ReadyToRun().
By creating the Desktop window in the constructor instead it is available
in RefsReceived() so an extra Desktop windows isn't opened.
----------------------------------------------------------------------------
Other related posts:
- » [haiku-commits] haiku: hrev47513 - in src: kits/tracker kits/storage/mime libs/icon kits/storage - jscipione
