hrev49115 adds 2 changesets to branch 'master'
old head: 9ac06d90b19cd50078ca487c0ebfe0907dc57dd9
new head: 37335989120ad8f18a9d3d2e4c8489410c0fc4e5
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=37335989120a+%5E9ac06d90b19c
----------------------------------------------------------------------------
4a6014fe23f5: Tracker: fix PoseView border in FilePanels.
37335989120a: Tracker: delete more non-Haiku code.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 3 insertions(+), 16 deletions(-)
src/kits/tracker/FilePanelPriv.cpp | 1 +
src/kits/tracker/PoseView.cpp | 16 ++--------------
src/kits/tracker/TrashWatcher.cpp | 2 --
############################################################################
Commit: 4a6014fe23f5d76ba4ec8e4bc00e0fa20b21dd49
URL: http://cgit.haiku-os.org/haiku/commit/?id=4a6014fe23f5
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Apr 26 17:58:36 2015 UTC
Tracker: fix PoseView border in FilePanels.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/FilePanelPriv.cpp
b/src/kits/tracker/FilePanelPriv.cpp
index 28909ee..de0469f 100644
--- a/src/kits/tracker/FilePanelPriv.cpp
+++ b/src/kits/tracker/FilePanelPriv.cpp
@@ -233,6 +233,7 @@ TFilePanel::TFilePanel(file_panel_mode mode, BMessenger*
target,
AutoLock<BWindow> lock(this);
fBorderedView = new BorderedView;
CreatePoseView(model);
+ fBorderedView->GroupLayout()->SetInsets(1);
fPoseView->SetRefFilter(filter);
if (!fIsSavePanel)
fPoseView->SetMultipleSelection(multipleSelection);
############################################################################
Revision: hrev49115
Commit: 37335989120ad8f18a9d3d2e4c8489410c0fc4e5
URL: http://cgit.haiku-os.org/haiku/commit/?id=37335989120a
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun Apr 26 18:01:05 2015 UTC
Tracker: delete more non-Haiku code.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index db5b039..e60e882 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -10076,20 +10076,8 @@ BPoseView::IsWatchingDateFormatChange()
void
BPoseView::StartWatchDateFormatChange()
{
-// TODO: Workaround for R5 (overful message queue)!
-// Unfortunately, this causes a dead-lock under certain circumstances.
-#if !defined(HAIKU_TARGET_PLATFORM_HAIKU) &&
!defined(HAIKU_TARGET_PLATFORM_DANO)
- if (IsFilePanel()) {
-#endif
- BMessenger trackerMessenger(kTrackerSignature);
- BHandler::StartWatching(trackerMessenger, kDateFormatChanged);
-#if !defined(HAIKU_TARGET_PLATFORM_HAIKU) &&
!defined(HAIKU_TARGET_PLATFORM_DANO)
- } else if (be_app->LockLooper()) {
- be_app->StartWatching(this, kDateFormatChanged);
- be_app->UnlockLooper();
- }
-#endif
-
+ BMessenger trackerMessenger(kTrackerSignature);
+ BHandler::StartWatching(trackerMessenger, kDateFormatChanged);
fIsWatchingDateFormatChange = true;
}
diff --git a/src/kits/tracker/TrashWatcher.cpp
b/src/kits/tracker/TrashWatcher.cpp
index fa9d4e2..c5059a3 100644
--- a/src/kits/tracker/TrashWatcher.cpp
+++ b/src/kits/tracker/TrashWatcher.cpp
@@ -173,7 +173,6 @@ BTrashWatcher::UpdateTrashIcons()
= GetTrackerResources()->LoadResource('MICN',
fTrashFull ? R_TrashFullIcon :
R_TrashIcon, &smallSize);
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
size_t vectorSize = 0;
const void* vectorData =
GetTrackerResources()->LoadResource(
B_VECTOR_ICON_TYPE,
@@ -184,7 +183,6 @@ BTrashWatcher::UpdateTrashIcons()
vectorData, vectorSize);
} else
TRESPASS();
-#endif
if (largeData) {
trashDir.WriteAttr(kAttrLargeIcon, 'ICON', 0,
