diff --git a/CHANGELOG.md b/CHANGELOG.md index ee71354..b88a868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ edbee.lib: +- fix #13, Added a method to disable the scrollarea shadows: widget->textScrollArea()->enableShadowWidget(bool) - fix #9, Updated onigmo library. Fixes compilation/linkage issue on Mac OS X (enc/windows_31j.c) - fix, Fixed build warnings via een #pragma for the onig library. (When updating vendor/onig, include "config-onig-edbee.h" in "config.h") - fix #5, Incorrect memory access after coalescing in TextDocument::ReplaceRangeSet. (Crash on Linux/Windows) diff --git a/edbee-lib/edbee/views/texteditorscrollarea.cpp b/edbee-lib/edbee/views/texteditorscrollarea.cpp index 0a768c3..1756f94 100644 --- a/edbee-lib/edbee/views/texteditorscrollarea.cpp +++ b/edbee-lib/edbee/views/texteditorscrollarea.cpp @@ -138,7 +138,6 @@ TextEditorScrollArea::TextEditorScrollArea(QWidget* parent) , shadowWidgetRef_(0) { shadowWidgetRef_ = new PrivateShadowWidget(this); - leftWidgetRef_ = shadowWidgetRef_ ; setFrameShape(QFrame::NoFrame); setFocusPolicy(Qt::NoFocus); } @@ -180,7 +179,9 @@ void TextEditorScrollArea::layoutMarginWidgets() setViewportMargins( left, top, right, bottom ); // overlay the shadow over the viewport - this->shadowWidgetRef_->setGeometry( viewport()->geometry() ); + if( shadowWidgetRef_ ) { + this->shadowWidgetRef_->setGeometry( viewport()->geometry() ); + } // set the widget if( leftWidgetRef_) { @@ -205,6 +206,11 @@ void TextEditorScrollArea::layoutMarginWidgets() } +void TextEditorScrollArea::enableShadowWidget(bool enabled) +{ + shadowWidgetRef_->setVisible(enabled); +} + void TextEditorScrollArea::resizeEvent(QResizeEvent* event) { diff --git a/edbee-lib/edbee/views/texteditorscrollarea.h b/edbee-lib/edbee/views/texteditorscrollarea.h index 33f18d6..d45c66e 100644 --- a/edbee-lib/edbee/views/texteditorscrollarea.h +++ b/edbee-lib/edbee/views/texteditorscrollarea.h @@ -27,22 +27,14 @@ class TextEditorScrollArea : public QScrollArea void setRightWidget(QWidget* widget); void setBottomWidget(QWidget* widget); - public: void layoutMarginWidgets(); - + void enableShadowWidget(bool enabled); protected: virtual void resizeEvent(QResizeEvent* event); -public: - void renderShade(QPaintEvent *event, QPainter* painter ); - - -signals: -public slots: - private: QWidget* leftWidgetRef_; ///< The left widget @@ -51,7 +43,6 @@ public slots: QWidget* bottomWidgetRef_; ///< The bottom widget PrivateShadowWidget* shadowWidgetRef_; ///< The private shadow widget - }; } // edbee