[haiku-commits] haiku: hrev48958 - src/kits/tracker
- From: waddlesplash@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 30 Mar 2015 00:38:28 +0200 (CEST)
hrev48958 adds 2 changesets to branch 'master'
old head: 4e3572635487f5a4fb948640fdeb747f47750e4a
new head: 2ead925e2f406b8867176f65788afaeb5f0f8ea0
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=2ead925e2f40+%5E4e3572635487
----------------------------------------------------------------------------
a1fc016c1417: Tracker: allow opening the desktop as a window in navigator mode.
Fixes #9610.
2ead925e2f40: Tracker: fix extra border in spatial mode.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 6 insertions(+), 8 deletions(-)
src/kits/tracker/ContainerWindow.cpp | 7 ++++---
src/kits/tracker/Navigator.cpp | 7 ++-----
############################################################################
Commit: a1fc016c141761ae663e0264c2d926a3032ceab1
URL: http://cgit.haiku-os.org/haiku/commit/?id=a1fc016c1417
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Mar 29 22:27:45 2015 UTC
Ticket: https://dev.haiku-os.org/ticket/9610
Tracker: allow opening the desktop as a window in navigator mode.
Fixes #9610.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Navigator.cpp b/src/kits/tracker/Navigator.cpp
index cf4b1cd..679f58a 100644
--- a/src/kits/tracker/Navigator.cpp
+++ b/src/kits/tracker/Navigator.cpp
@@ -189,8 +189,7 @@ BNavigator::GoUp(bool option)
BEntry entry;
if (entry.SetTo(fPath.Path()) == B_OK) {
BEntry parentEntry;
- if (entry.GetParent(&parentEntry) == B_OK
- && !FSIsDeskDir(&parentEntry)) {
+ if (entry.GetParent(&parentEntry) == B_OK) {
SendNavigationMessage(kActionUp, &parentEntry, option);
}
}
@@ -266,7 +265,6 @@ BNavigator::GoTo()
entry_ref ref;
if (entry.SetTo(pathname.String()) == B_OK
- && !FSIsDeskDir(&entry)
&& entry.GetRef(&ref) == B_OK) {
BMessage message(kSwitchDirectory);
message.AddRef("refs", &ref);
@@ -317,8 +315,7 @@ BNavigator::UpdateLocation(const Model* newmodel, int32
action)
BEntry entry;
if (entry.SetTo(fPath.Path()) == B_OK) {
BEntry parentEntry;
- bool enable = entry.GetParent(&parentEntry) == B_OK
- && !FSIsDeskDir(&parentEntry);
+ bool enable = entry.GetParent(&parentEntry) == B_OK;
SetActionEnabled(kNavigatorCommandUp, enable);
}
############################################################################
Revision: hrev48958
Commit: 2ead925e2f406b8867176f65788afaeb5f0f8ea0
URL: http://cgit.haiku-os.org/haiku/commit/?id=2ead925e2f40
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Mar 29 22:36:51 2015 UTC
Tracker: fix extra border in spatial mode.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/ContainerWindow.cpp
b/src/kits/tracker/ContainerWindow.cpp
index 2b71f51..4f5d5a4 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -722,6 +722,7 @@ BContainerWindow::CreatePoseView(Model* model)
fPoseView = NewPoseView(model, kListMode);
fBorderedView->GroupLayout()->AddView(fPoseView);
+ fBorderedView->GroupLayout()->SetInsets(1, 0, 1, 1);
fBorderedView->EnableBorderHighlight(false);
TrackerSettings settings;
@@ -729,10 +730,10 @@ BContainerWindow::CreatePoseView(Model* model)
&& !fPoseView->IsFilePanel()) {
fNavigator = new BNavigator(model);
fPoseContainer->GridLayout()->AddView(fNavigator, 0, 0, 2);
- if (!settings.ShowNavigator()) {
+ if (settings.ShowNavigator())
+ fBorderedView->GroupLayout()->SetInsets(1);
+ else
fNavigator->Hide();
- fBorderedView->GroupLayout()->SetInsets(1, 0, 1, 1);
- }
}
SetPathWatchingEnabled(settings.ShowNavigator()
Other related posts:
- » [haiku-commits] haiku: hrev48958 - src/kits/tracker - waddlesplash
