--- a/ginebra2/ScrollableViewBase.h Thu Sep 23 15:32:11 2010 -0400
+++ b/ginebra2/ScrollableViewBase.h Fri Oct 15 17:30:59 2010 -0400
@@ -31,27 +31,31 @@
class KineticScroller;
class ScrollableViewBase : public QGraphicsWidget, public KineticScrollable {
+ Q_OBJECT
public:
ScrollableViewBase(QGraphicsItem* parent = 0, Qt::WindowFlags wFlags = 0);
~ScrollableViewBase();
void setWidget(QGraphicsWidget*);
+Q_SIGNALS:
+ void viewScrolled(QPoint& scrollPos, QPoint& delta);
+
protected:
//KineticScrollable pure virtuals
QSize viewportSize() const;
QPoint maximumScrollPosition() const ;
QPoint scrollPosition() const;
- void setScrollPosition(const QPoint& pos, const QPoint& overshootDelta);
+ void setScrollPosition(const QPoint& pos, const QPoint& overshootDelta = QPoint(0,0));
void stateChanged(KineticScrollable::State oldState, KineticScrollable::State newState);
QGraphicsWidget* scrollWidget() const { return m_scrollWidget; }
- virtual void setScrollWidgetGeometry(const QRectF& r);
- QRectF adjustScrollWidgetRect(const QRectF&);
+// virtual void setScrollWidgetGeometry(const QRectF& r);
+// QRectF adjustScrollWidgetRect(const QRectF&);
//Helpers for adjusting scroll pos
- void setScrollWidgetPos(const QPointF& pos);
+ virtual void setScrollWidgetPos(const QPointF& pos);
QPointF scrollWidgetPos() const;
protected: