Removed horizontal scroll bar from swatches when embedded.

(bzr r155)

6 files changed, 43 insertions, 0 deletions

diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index 739cda3b2..dd48fa539 100644
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -482,6 +482,15 @@ SwatchesPanel::~SwatchesPanel()
 {
 }
 
+void SwatchesPanel::Temp()
+{
+    if ( _holder )
+    {
+        _holder->setOrientation( Gtk::ANCHOR_SOUTH );
+    }
+}
+
+
 void SwatchesPanel::_handleAction( int setId, int itemId )
 {
     switch( setId ) {
diff --git a/src/dialogs/swatches.h b/src/dialogs/swatches.h
index ca17cd066..fea2b8309 100644
--- a/src/dialogs/swatches.h
+++ b/src/dialogs/swatches.h
@@ -61,6 +61,8 @@ public:
 
     static SwatchesPanel& getInstance();
 
+    void Temp();
+
 protected:
     virtual void _handleAction( int setId, int itemId );
 
diff --git a/src/ui/previewfillable.h b/src/ui/previewfillable.h
index 106eda7ea..b62ab6b99 100644
--- a/src/ui/previewfillable.h
+++ b/src/ui/previewfillable.h
@@ -26,6 +26,7 @@ public:
     virtual void clear() = 0;
     virtual void addPreview( Previewable* preview ) = 0;
     virtual void setStyle(Gtk::BuiltinIconSize size, ViewType type) = 0;
+    virtual void setOrientation( Gtk::AnchorType how ) = 0;
     virtual Gtk::BuiltinIconSize getPreviewSize() const = 0;
     virtual ViewType getPreviewType() const = 0;
 };
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index e73cd7407..321b7899f 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -24,6 +24,7 @@ PreviewHolder::PreviewHolder() :
     VBox(),
     PreviewFillable(),
     _scroller(0),
+    _anchor(Gtk::ANCHOR_CENTER),
     _baseSize(Gtk::ICON_SIZE_MENU),
     _view(VIEW_TYPE_LIST)
 {
@@ -84,6 +85,33 @@ void PreviewHolder::setStyle(Gtk::BuiltinIconSize size, ViewType view)
     }
 }
 
+void PreviewHolder::setOrientation( Gtk::AnchorType how )
+{
+    if ( _anchor != how )
+    {
+        switch ( _anchor )
+        {
+            case Gtk::ANCHOR_NORTH:
+            case Gtk::ANCHOR_SOUTH:
+            {
+                dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER );
+            }
+            break;
+
+            case Gtk::ANCHOR_EAST:
+            case Gtk::ANCHOR_WEST:
+            {
+                dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC );
+            }
+            break;
+
+            default:
+            {
+                dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC );
+            }
+        }
+    }
+}
 
 void PreviewHolder::rebuildUI()
 {
diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h
index 96d9b8228..532aa771f 100644
--- a/src/ui/previewholder.h
+++ b/src/ui/previewholder.h
@@ -30,6 +30,7 @@ public:
     virtual void clear();
     virtual void addPreview( Previewable* preview );
     virtual void setStyle(Gtk::BuiltinIconSize size, ViewType view);
+    virtual void setOrientation( Gtk::AnchorType how );
     virtual Gtk::BuiltinIconSize getPreviewSize() const { return _baseSize; }
     virtual ViewType getPreviewType() const { return _view; }
 
@@ -39,6 +40,7 @@ private:
     std::vector<Previewable*> items;
     Gtk::Bin *_scroller;
     Gtk::Table *_insides;
+    Gtk::AnchorType _anchor;
     Gtk::BuiltinIconSize _baseSize;
     ViewType _view;
 };
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 2cd6f13d3..acd631c6a 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -184,6 +184,7 @@ sp_desktop_widget_init (SPDesktopWidget *dtw)
         using Inkscape::UI::Dialogs::SwatchesPanel;
 
         SwatchesPanel* swatches = new SwatchesPanel();
+        swatches->Temp();
         dtw->panels = GTK_WIDGET(swatches->gobj());
         gtk_box_pack_end( GTK_BOX( dtw->vbox ), dtw->panels, FALSE, TRUE, 0 );
     }