Commit 5f899211 authored by mae's avatar mae
Browse files

polishing of block highlighting, and a new folder bar.

parent dfd2c5db
This diff is collapsed.
......@@ -370,7 +370,6 @@ private slots:
void restoreCursorPosition();
void highlightSearchResults(const QString &txt, QTextDocument::FindFlags findFlags);
void setFindScope(const QTextCursor &);
void setCollapseIndicatorAlpha(int);
void currentEditorChanged(Core::IEditor *editor);
private:
......@@ -460,7 +459,7 @@ private:
void saveCurrentCursorPositionForNavigation();
void toggleBlockVisible(const QTextBlock &block);
QRect collapseBox(const QTextBlock &block);
QRect collapseBox();
QTextBlock collapsedBlockAt(const QPoint &pos, QRect *box = 0) const;
......
......@@ -33,7 +33,6 @@
#include "basetexteditor.h"
#include <QtCore/QBasicTimer>
#include <QtCore/QTimeLine>
#include <QtCore/QSharedData>
#include <QtGui/QTextEdit>
......@@ -119,6 +118,7 @@ struct BaseTextEditorPrivateHighlightBlocks
QList<int> open;
QList<int> close;
QList<int> visualIndent;
inline bool isEmpty() const { return open.isEmpty() || close.isEmpty() || visualIndent.isEmpty(); }
inline bool operator==(const BaseTextEditorPrivateHighlightBlocks &o) const {
return (open == o.open && close == o.close && visualIndent == o.visualIndent);
}
......@@ -178,9 +178,7 @@ public:
int extraAreaSelectionAnchorBlockNumber;
int extraAreaToggleMarkBlockNumber;
int extraAreaHighlightCollapseBlockNumber;
int extraAreaCollapseAlpha;
int extraAreaHighlightFadingBlockNumber;
QTimeLine *extraAreaTimeLine;
int extraAreaHighlightCollapseColumn;
QBasicTimer collapsedBlockTimer;
int visibleCollapsedBlockNumber;
......
......@@ -40,7 +40,7 @@ static const char * const showWrapColumnKey = "ShowWrapColumn";
static const char * const wrapColumnKey = "WrapColumn";
static const char * const visualizeWhitespaceKey = "VisualizeWhitespace";
static const char * const displayFoldingMarkersKey = "DisplayFoldingMarkersV2";
static const char * const highlightCurrentLineKey = "HighlightCurrentLineKey";
static const char * const highlightCurrentLineKey = "HighlightCurrentLineKeyV2";
static const char * const highlightBlocksKey = "HighlightBlocksKeyV2";
static const char * const groupPostfix = "DisplaySettings";
......@@ -53,7 +53,7 @@ DisplaySettings::DisplaySettings() :
m_wrapColumn(80),
m_visualizeWhitespace(false),
m_displayFoldingMarkers(false),
m_highlightCurrentLine(true),
m_highlightCurrentLine(false),
m_highlightBlocks(true)
{
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment