feat(TextEdit): auto adjust scrollbar margins.

Change-Id: Ia5f5533b5e2a66893f72d6d68a072369fe413929
linuxdeepin · Sep 18, 2018 · 9255975 · 9255975
1 parent 9d05c9c
commit 9255975
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/editor/src/texteditor.cpp b/editor/src/texteditor.cpp
@@ -155,7 +155,7 @@ TextEditor::TextEditor(QPlainTextEdit *parent)
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-    connect(verticalScrollBar(), &QScrollBar::rangeChanged, this, &TextEditor::adjustScrollbarMargins);
+    connect(verticalScrollBar(), &QScrollBar::rangeChanged, this, &TextEditor::adjustScrollbarMargins, Qt::QueuedConnection);
 }
 
 int TextEditor::getCurrentLine()
@@ -2312,19 +2312,17 @@ bool TextEditor::eventFilter(QObject *, QEvent *event)
 
 void TextEditor::adjustScrollbarMargins()
 {
-    if (isVisible() && !m_scrollbarLock) {
-        m_scrollbarLock = true;
-
-        int documentHeight = (verticalScrollBar()->maximum() - verticalScrollBar()->minimum() + verticalScrollBar()->pageStep()) * fontMetrics().height();
+    if (!isVisible()) {
+        return;
+    }
 
-        if (documentHeight > rect().height()) {
-            // setViewportMargins(0, 0, -verticalScrollBar()->sizeHint().width(), -horizontalScrollBar()->sizeHint().height() + m_scrollbarMargin);
-            setViewportMargins(0, 0, -verticalScrollBar()->sizeHint().width(), 0);
-        } else {
-            setViewportMargins(0, 0, 0, 0);
-        }
+    QEvent event(QEvent::LayoutRequest);
+    QApplication::sendEvent(this, &event);
 
-        m_scrollbarLock = false;
+    if (!verticalScrollBar()->visibleRegion().isEmpty()) {
+        setViewportMargins(0, 0, -verticalScrollBar()->sizeHint().width(), 0);
+    } else {
+        setViewportMargins(0, 0, 0, 0);
     }
 }
 

diff --git a/editor/src/texteditor.h b/editor/src/texteditor.h
@@ -286,8 +286,6 @@ public slots:
     QPoint m_mouseClickPos;
 
     bool m_highlighted = false;
-    bool m_scrollbarLock = false;
-    int m_scrollbarMargin = 0;
 };
 
 #endif
diff --git a/editor/src/theme_module/themelistview.cpp b/editor/src/theme_module/themelistview.cpp
@@ -41,6 +41,10 @@ ThemeListView::~ThemeListView()
 
 void ThemeListView::adjustScrollbarMargins()
 {
+    if (!isVisible()) {
+        return;
+    }
+
     QEvent event(QEvent::LayoutRequest);
     QApplication::sendEvent(this, &event);
 

diff --git a/editor/src/window.cpp b/editor/src/window.cpp
@@ -1324,6 +1324,11 @@ void Window::loadTheme(const QString &path)
         editor->textEditor->setThemeWithPath(path);
     }
 
+    // set background.
+    QPalette palette = this->palette();
+    palette.setColor(QPalette::Background, QColor(backgroundColor));
+    setPalette(palette);
+
     m_themePanel->setBackground(backgroundColor);
     m_jumpLineBar->setBackground(backgroundColor);
     m_replaceBar->setBackground(backgroundColor);