[haiku-commits] haiku: hrev48849 - src/kits/tracker

From: waddlesplash@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Mon, 2 Mar 2015 18:26:29 +0100 (CET)
hrev48849 adds 3 changesets to branch 'master'
old head: 4a33b4e55c71b6e981d211f9dc78cc40d92c969c
new head: 1d329e209ad284d7c84cf1b13c59f31711d38d7b
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=1d329e209ad2+%5E4a33b4e55c71

----------------------------------------------------------------------------

1dedefaf231d: Tracker: don't initialize layouts when we're not supposed to.
  
  This didn't cause any problems before because all the views that don't
  use layouts reimplemented this function. But that may not be the case in
  the future.

cd70e3e26c83: Tracker: delete MetroWerks compatibility stuff.

1d329e209ad2: Tracker: fix CountView sizing issues.
  
  And now, the sizing differences between layout Tracker and non-layout Tracker
  should not be noticeable to the naked eye.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

3 files changed, 10 insertions(+), 27 deletions(-)
src/kits/tracker/ContainerWindow.cpp |  9 +++++----
src/kits/tracker/ContainerWindow.h   |  1 +
src/kits/tracker/FBCPadding.cpp      | 27 ++++-----------------------

############################################################################

Commit:      1dedefaf231d4799e9a8927f68ca4af7bd0cfd3a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=1dedefaf231d
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Mon Mar  2 16:29:11 2015 UTC

Tracker: don't initialize layouts when we're not supposed to.

This didn't cause any problems before because all the views that don't
use layouts reimplemented this function. But that may not be the case in
the future.

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/ContainerWindow.cpp 
b/src/kits/tracker/ContainerWindow.cpp
index 97346fa..14a0786 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -461,6 +461,7 @@ BContainerWindow::BContainerWindow(LockingList<BWindow>* 
list,
        :
        BWindow(InitialWindowRect(feel), "TrackerWindow", look, feel, flags,
                workspace),
+       fUseLayouts(useLayouts),
        fMenuContainer(NULL),
        fPoseContainer(NULL),
        fBorderedView(NULL),
@@ -1011,7 +1012,7 @@ BContainerWindow::RestoreState(const BMessage &message)
 void
 BContainerWindow::RestoreStateCommon()
 {
-       if (!fIsDesktop)
+       if (!fIsDesktop && fUseLayouts)
                InitLayout();
 
        if (BootedInSafeMode())
diff --git a/src/kits/tracker/ContainerWindow.h 
b/src/kits/tracker/ContainerWindow.h
index 4b48b85..58b8d20 100644
--- a/src/kits/tracker/ContainerWindow.h
+++ b/src/kits/tracker/ContainerWindow.h
@@ -280,6 +280,7 @@ protected:
                BObjectList<Model>*, void*, BStringList&);
        void LoadAddOn(BMessage*);
 
+       bool fUseLayouts;
        BGroupLayout* fRootLayout;
        BGroupView* fMenuContainer;
        BGridView* fPoseContainer;

############################################################################

Commit:      cd70e3e26c83005b5d50a61a12a75bc1e924436d
URL:         http://cgit.haiku-os.org/haiku/commit/?id=cd70e3e26c83
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Mon Mar  2 16:34:34 2015 UTC

Tracker: delete MetroWerks compatibility stuff.

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/FBCPadding.cpp b/src/kits/tracker/FBCPadding.cpp
index 20aef9e..78d98f1 100644
--- a/src/kits/tracker/FBCPadding.cpp
+++ b/src/kits/tracker/FBCPadding.cpp
@@ -93,15 +93,11 @@ void BFilePanel::_ReservedFilePanel8() {}
 
 // deprecated cruft
 
-#if __GNUC__ && __GNUC__ < 3 || __MWERKS__
+#if __GNUC__ && __GNUC__ < 3
 extern "C" {
 
 _EXPORT BFilePanel*
-#if __GNUC__
 
__10BFilePanel15file_panel_modeP10BMessengerP9entry_refUlbP8BMessageP10BRefFilterT5T5
-#elif __MWERKS__
-__ct__10BFilePanelF15file_panel_modeP10BMessengerP9entry_refUlbP8BMessageP10BRefFilterbb
-#endif
 (void* self,
        file_panel_mode mode, BMessenger* target,
        entry_ref* ref, uint32 nodeFlavors, bool multipleSelection,
@@ -114,34 +110,19 @@ 
__ct__10BFilePanelF15file_panel_modeP10BMessengerP9entry_refUlbP8BMessageP10BRef
 }
 
 _EXPORT void
-#if __GNUC__
-SetPanelDirectory__10BFilePanelP10BDirectory
-#elif __MWERKS__
-SetPanelDirectory__10BFilePanelFP10BDirectory
-#endif
-(BFilePanel* self, BDirectory* d)
+SetPanelDirectory__10BFilePanelP10BDirectory(BFilePanel* self, BDirectory* d)
 {
        self->SetPanelDirectory(d);
 }
 
 _EXPORT void
-#if __GNUC__
-SetPanelDirectory__10BFilePanelP6BEntry
-#elif __MWERKS__
-SetPanelDirectory__10BFilePanelFP6BEntry
-#endif
-(BFilePanel* self, BEntry* e)
+SetPanelDirectory__10BFilePanelP6BEntry(BFilePanel* self, BEntry* e)
 {
        self->SetPanelDirectory(e);
 }
 
 _EXPORT void
-#if __GNUC__
-SetPanelDirectory__10BFilePanelP9entry_ref
-#elif __MWERKS__
-SetPanelDirectory__10BFilePanelFP9entry_ref
-#endif
-(BFilePanel* self, entry_ref* r)
+SetPanelDirectory__10BFilePanelP9entry_ref(BFilePanel* self, entry_ref* r)
 {
        self->SetPanelDirectory(r);
 }

############################################################################

Revision:    hrev48849
Commit:      1d329e209ad284d7c84cf1b13c59f31711d38d7b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=1d329e209ad2
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Mon Mar  2 17:17:35 2015 UTC

Tracker: fix CountView sizing issues.

And now, the sizing differences between layout Tracker and non-layout Tracker
should not be noticeable to the naked eye.

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/ContainerWindow.cpp 
b/src/kits/tracker/ContainerWindow.cpp
index 14a0786..808b3af 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -962,7 +962,7 @@ BContainerWindow::InitLayout()
        item = fCountContainer->GroupLayout()->AddView(fPoseView->CountView());
        minSize = item->MinSize();
        maxSize = item->MaxSize();
-       item->SetExplicitMinSize(BSize(kCountViewWidth, minSize.Height()));
+       item->SetExplicitMinSize(BSize(kCountViewWidth, B_H_SCROLL_BAR_HEIGHT));
        item->SetExplicitMaxSize(BSize(kCountViewWidth, maxSize.Height()));
 
        // Eliminate the extra borders
@@ -973,13 +973,13 @@ BContainerWindow::InitLayout()
        if (fPoseView->VScrollBar() != NULL) {
                fVScrollBarContainer = new BGroupView(B_VERTICAL, 0);
                
fVScrollBarContainer->GroupLayout()->AddView(fPoseView->VScrollBar());
-               fVScrollBarContainer->GroupLayout()->SetInsets(-1, 0, 0, 1);
+               fVScrollBarContainer->GroupLayout()->SetInsets(-1, 0, 0, 0);
                fPoseContainer->GridLayout()->AddView(fVScrollBarContainer, 1, 
1);
        }
        if (fPoseView->HScrollBar() != NULL) {
                BGroupView* hScrollBarContainer = new BGroupView(B_VERTICAL, 0);
                
hScrollBarContainer->GroupLayout()->AddView(fPoseView->HScrollBar());
-               hScrollBarContainer->GroupLayout()->SetInsets(0, -1, 0, 0);
+               hScrollBarContainer->GroupLayout()->SetInsets(0, -1, 0, -1);
                fCountContainer->GroupLayout()->AddView(hScrollBarContainer);
        }
 }
[haiku-commits] haiku: hrev48849 - src/kits/tracker

Other related posts:
