diff --git a/src/gui/UBLeftPalette.cpp b/src/gui/UBLeftPalette.cpp index 299e8494..2172eb2b 100644 --- a/src/gui/UBLeftPalette.cpp +++ b/src/gui/UBLeftPalette.cpp @@ -20,11 +20,16 @@ UBLeftPalette::UBLeftPalette(QWidget *parent, const char *name):UBDockPalette(pa setObjectName(name); setOrientation(eUBDockOrientation_Left); mLastWidth = 300; - setMaximumWidth(300); - resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), height()); + mCollapseWidth = 180; +/* + resize(UBSettings::settings()->libPaletteWidth->get().toInt(), parentWidget()->height()); + mpLayout->setContentsMargins(2*border() + customMargin(), customMargin(), customMargin(), customMargin()); +*/ + resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), parentWidget()->height()); mpLayout->setContentsMargins(customMargin(), customMargin(), 2*border() + customMargin(), customMargin()); + // Add the widgets here mpPageNavigator = new UBPageNavigationWidget(this); addTabWidget(mpPageNavigator); } @@ -38,6 +43,21 @@ UBLeftPalette::~UBLeftPalette() } } +void UBLeftPalette::updateMaxWidth() +{ + setMaximumWidth(300); +} + +void UBLeftPalette::resizeEvent(QResizeEvent *event) +{ + UBDockPalette::resizeEvent(event); + if(NULL != mpPageNavigator) + { + mpPageNavigator->setMinimumHeight(height() - 2*border()); + } + UBSettings::settings()->navigPaletteWidth->set(width()); +} + UBPageNavigationWidget* UBLeftPalette::pageNavigator() { return mpPageNavigator; diff --git a/src/gui/UBLeftPalette.h b/src/gui/UBLeftPalette.h index 61e0e1ce..a2f549ec 100644 --- a/src/gui/UBLeftPalette.h +++ b/src/gui/UBLeftPalette.h @@ -26,6 +26,10 @@ public: UBPageNavigationWidget* pageNavigator(); +protected: + void updateMaxWidth(); + void resizeEvent(QResizeEvent *event); + private: UBPageNavigationWidget* mpPageNavigator; diff --git a/src/gui/UBPageNavigationWidget.cpp b/src/gui/UBPageNavigationWidget.cpp index 6f598fd0..6d7896af 100644 --- a/src/gui/UBPageNavigationWidget.cpp +++ b/src/gui/UBPageNavigationWidget.cpp @@ -141,21 +141,6 @@ void UBPageNavigationWidget::refresh() mNavigator->setDocument(UBApplication::boardController->activeDocument()); } -/** - * \brief Handle the resize event - * @param event as the resize event - */ -void UBPageNavigationWidget::resizeEvent(QResizeEvent *event) -{ - emit resizeRequest(event); - //UBDockPalette::resizeEvent(event); - if(NULL != mNavigator) - { - mNavigator->setMinimumHeight(height() - 2*border()); - } - UBSettings::settings()->navigPaletteWidth->set(width()); -} - /** * \brief Notify a timer event * @param event as the timer event diff --git a/src/gui/UBPageNavigationWidget.h b/src/gui/UBPageNavigationWidget.h index 8f1ca723..ce4993bb 100644 --- a/src/gui/UBPageNavigationWidget.h +++ b/src/gui/UBPageNavigationWidget.h @@ -43,7 +43,6 @@ public slots: void setPageNumber(int current, int total); protected: - virtual void resizeEvent(QResizeEvent *event); virtual void timerEvent(QTimerEvent *event); private: diff --git a/src/gui/UBRightPalette.cpp b/src/gui/UBRightPalette.cpp index ee673ac8..b07a5ed8 100644 --- a/src/gui/UBRightPalette.cpp +++ b/src/gui/UBRightPalette.cpp @@ -23,7 +23,6 @@ UBRightPalette::UBRightPalette(QWidget *parent, const char *name):UBDockPalette( { setObjectName(name); setOrientation(eUBDockOrientation_Right); - setOrientation(eUBDockOrientation_Right); mCollapseWidth = 180; mLastWidth = 300; resize(UBSettings::settings()->libPaletteWidth->get().toInt(), parentWidget()->height());