TODO Fold

Author: jgehrig

src/gui/cmdline/CMakeLists.txt

@@ -12,7 +12,6 @@ set(SOURCES
   blockdisplay.cpp
   linemodel.cpp
   extcmdlinewidget.cpp
-  qrichlineedit.cpp
   )
 
 add_library(extcmdline STATIC ${SOURCES})

src/gui/cmdline/extcmdlinewidget.cpp

@@ -5,17 +5,25 @@
 
 namespace NeovimQt { namespace Cmdline {
 
-ExtCmdlineWidget::ExtCmdlineWidget(ShellWidget* parent)
+ExtCmdlineWidget::ExtCmdlineWidget(ShellWidget& parent)
 {
-	setParent(parent);
+	setParent(&parent);
 	setVisible(false);
 
-	m_cmdTextBox = new QRichLineEdit();
+	m_cmdTextBoxFrame = new QFrame();
+	m_cmdTextBoxFrame->setFrameShape(QFrame::StyledPanel);
+	m_cmdTextBoxFrame->setFrameShadow(QFrame::Raised);
+	QVBoxLayout* frameLayout = new QVBoxLayout(m_cmdTextBoxFrame);
+
+	m_cmdTextBox = new ShellWidget();
+	frameLayout->addWidget(m_cmdTextBox);
+
 	m_cmdBlockText = new BlockDisplay();
+	m_cmdTextBox->setIgnoreFocus(true);
 
 	m_vLayout = new QVBoxLayout();
 	m_vLayout->addWidget(m_cmdBlockText);
-	m_vLayout->addWidget(m_cmdTextBox);
+	m_vLayout->addWidget(m_cmdTextBoxFrame);
 	setLayout(m_vLayout);
 
 	// The size of this widget must change when text content changes.
@@ -31,6 +39,10 @@ void ExtCmdlineWidget::handleCmdlineShow(
 	int indent,
 	int level)
 {
+	ShellWidget* parentShellWidget{ static_cast<ShellWidget*>(parentWidget()) };
+
+	m_cmdTextBox->CopyCursorStyle(parentShellWidget->getCursor());
+
 	QString cmdlineContent;
 
 	LineModel lineModel{ content, pos, firstc, prompt, indent, level };
@@ -41,12 +53,35 @@ void ExtCmdlineWidget::handleCmdlineShow(
 		m_model[level - 1] = std::move(lineModel);
 	}
 
-	m_cmdTextBox->setText(m_model.last().getPromptText());
+	m_cmdTextBox->clearShell();
+
+	const QString& text{ m_model.last().getPromptText() };
+
+	auto getShellSize = [&]() noexcept
+	{
+		const int cellSize{ m_cmdTextBox->cellSize().width() };
+		const int columns{ m_cmdTextBox->size().width() / cellSize };
+		const int rows{ text.size() / columns + 1 };
+
+		return QSize{ std::max(columns, 1), rows};
+	};
+
+	const QSize cmdSize{ getShellSize() };
+	m_cmdTextBox->resizeShell(cmdSize);
+
+	for (int i=0;i<cmdSize.height();i++) {
+		int startPos = i * cmdSize.width();
+		QString row{ text.mid(startPos, cmdSize.width()) };
+		m_cmdTextBox->put(row, i, 0);
+	}
+
+	const int cols{ cmdSize.width() };
+
+	m_cmdTextBox->setNeovimCursor(pos / cols, pos % cols + 1);
+	m_cmdTextBox->update();
 
 	updateGeometry();
 	show();
-
-	setCursorPosition(pos);
 }
 
 void ExtCmdlineWidget::handleCmdlinePos(
@@ -59,7 +94,14 @@ void ExtCmdlineWidget::handleCmdlinePos(
 	}
 
 	m_model[level - 1].m_position = pos;
-	setCursorPosition(pos);
+	Cursor cursor;
+	//setCursorPosition(pos);
+	qDebug() << "Handle Cursor Position";
+	m_cmdTextBox->setNeovimCursor(0, pos);
+	m_cmdTextBox->resizeShell(1, m_model[level -1].getPromptText().size());
+	//m_cmdTextBox->setCursorColors(Qt::blue, Qt::red);
+	//m_cmdTextBox->setCursorStuff();
+	update();
 }
 
 void ExtCmdlineWidget::handleCmdlineSpecialChar(
@@ -83,7 +125,7 @@ void ExtCmdlineWidget::handleCmdlineSpecialChar(
 		line.m_content.replace(line.m_position, 1, c);
 	}
 
-	m_cmdTextBox->setText(line.getPromptText());
+	m_cmdTextBox->put(line.getPromptText(),0,0); // FIXME
 }
 
 void ExtCmdlineWidget::handleCmdlineHide()
@@ -174,11 +216,11 @@ void ExtCmdlineWidget::setCursorPosition(int pos)
 	QTextCharFormat fmtInverse;
 	fmtInverse.setBackground(parentShellWidget->foreground());
 	fmtInverse.setForeground(parentShellWidget->background());
-	m_cmdTextBox->setTextFormat({ { posCursorReal, 1, fmtInverse} });
+	//m_cmdTextBox->setTextFormat({ { posCursorReal, 1, fmtInverse} });
 
 	// Ensures ':' is shown when users scrolls full left
 	if (pos == 0) {
-		m_cmdTextBox->setCursorPosition(0);
+		m_cmdTextBox->setNeovimCursor(0,0);
 		return;
 	}
 
@@ -190,7 +232,7 @@ void ExtCmdlineWidget::setCursorPosition(int pos)
 	if (last_pos <= pos) {
 		++cursorPositionQt;
 	}
-	m_cmdTextBox->setCursorPosition(cursorPositionQt);
+	m_cmdTextBox->setNeovimCursor(0,cursorPositionQt);
 
 	last_pos = pos;
 }
@@ -236,14 +278,17 @@ void ExtCmdlineWidget::updatePalette()
 	m_palette.setColor(QPalette::Text, parentShellWidget->foreground());
 	m_palette.setColor(QPalette::Background, parentShellWidget->foreground());
 
-	m_cmdTextBox->setPalette(m_palette);
 	m_cmdBlockText->setPalette(m_palette);
+
+	m_cmdTextBox->setBackground(parentShellWidget->background());
+	m_cmdTextBox->setForeground(parentShellWidget->foreground());
+	m_cmdTextBox->setStyleSheet(".ShellWidget{background-color: red; border: 1px solid black; border-radius: 10px;}");
 }
 
 void ExtCmdlineWidget::setFont(const QFont &font)
 {
 	m_cmdBlockText->setFont(font);
-	m_cmdTextBox->setFont(font);
+	//m_cmdTextBox->setFont(font);
 }
 
 } } // namespace NeovimQt::Cmdline

src/gui/cmdline/extcmdlinewidget.h

@@ -9,15 +9,14 @@
 
 #include "blockdisplay.h"
 #include "linemodel.h"
-#include "qrichlineedit.h"
 
 namespace NeovimQt { namespace Cmdline {
 
 class ExtCmdlineWidget : public QFrame{
 	Q_OBJECT
 
 public:
-	ExtCmdlineWidget(ShellWidget* parent = nullptr);
+	ExtCmdlineWidget(ShellWidget& parent);
 
 	virtual void handleCmdlineShow(
 		const QVariantList& content,
@@ -59,7 +58,8 @@ class ExtCmdlineWidget : public QFrame{
 private:
 	int getMaxPromptLength() const;
 
-	QRichLineEdit* m_cmdTextBox;
+	QFrame* m_cmdTextBoxFrame;
+	ShellWidget* m_cmdTextBox;
 	BlockDisplay* m_cmdBlockText;
 
 	QVBoxLayout* m_vLayout;

src/gui/cmdline/qrichlineedit.cpp

@@ -221,7 +221,7 @@ private slots:
 	/// GuiScrollBar last known position: used to compute scroll line delta.
 	int m_lastScrollBarPosition{ 0 };
 
-	Cmdline::ExtCmdlineWidget m_cmdlineWidget{ this };
+	Cmdline::ExtCmdlineWidget m_cmdlineWidget{ *this };
 };
 
 class ShellRequestHandler: public QObject, public MsgpackRequestHandler

src/gui/cmdline/qrichlineedit.h

@@ -35,6 +35,15 @@ class Cursor : public QObject
 		m_foreground = highlight.GetForegroundColor();
 	}
 
+	void CopyCursorStyle(const Cursor& cursor) noexcept
+	{
+		m_background = cursor.GetBackgroundColor();
+		m_foreground = cursor.GetForegroundColor();
+		m_shape = cursor.GetShape();
+		m_percentage = cursor.GetPercentage();
+		m_styleEnabled = true; // FIXME rebase...
+	}
+
 	void SetStyle(Shape cursorShape, uint8_t cellPercentage) noexcept
 	{
 		m_shape = cursorShape;

src/gui/shell.h

@@ -6,7 +6,7 @@
 #include "helpers.h"
 
 ShellWidget::ShellWidget(QWidget* parent)
-	: QWidget(parent)
+	: QFrame(parent)
 {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	setAttribute(Qt::WA_KeyCompression, false);
@@ -155,7 +155,7 @@ void ShellWidget::paintNeovimCursorBackground(QPainter& p, QRect cellRect) noexc
 	}
 
 	// If the window does not have focus, draw an outline around the cursor cell.
-	if (!hasFocus()) {
+	if (!m_ignoreFocus && !hasFocus()) {
 		QRect noFocusCursorRect{ cellRect };
 		noFocusCursorRect.adjust(-1, -1, -1, -1);
 
@@ -177,7 +177,7 @@ void ShellWidget::paintNeovimCursorForeground(
 	QChar character) noexcept
 {
 	// No focus: cursor is outline with default foreground color.
-	if (!hasFocus()) {
+	if (!m_ignoreFocus && !hasFocus()) {
 		return;
 	}
 
@@ -359,6 +359,11 @@ QSize ShellWidget::sizeHint() const
 				m_cellSize.height()*m_contents.rows());
 }
 
+void ShellWidget::resizeShell(QSize size) noexcept
+{
+	resizeShell(size.height(), size.width());
+}
+
 void ShellWidget::resizeShell(int n_rows, int n_columns)
 {
 	if (n_rows != rows() || n_columns != columns()) {

src/gui/shellwidget/cursor.h

@@ -2,11 +2,12 @@
 #define QSHELLWIDGET2_SHELLWIDGET
 
 #include <QWidget>
+#include <QFrame>
 
 #include "shellcontents.h"
 #include "cursor.h"
 
-class ShellWidget: public QWidget
+class ShellWidget: public QFrame
 {
 	Q_OBJECT
 	Q_PROPERTY(QColor background READ background WRITE setBackground)
@@ -46,10 +47,34 @@ class ShellWidget: public QWidget
 
 	void setBackgroundType(Background type) { m_background = type; }
 
+	/// Move the neovim cursor for text insertion and display
+	void setNeovimCursor(uint64_t col, uint64_t row) noexcept;
+
+	const Cursor& getCursor() const noexcept
+	{
+		return m_cursor;
+	}
+
+	void CopyCursorStyle(const Cursor& cursor) noexcept
+	{
+		m_cursor.CopyCursorStyle(cursor);
+	}
+
+	void setIgnoreFocus(bool ignore) noexcept
+	{
+		m_ignoreFocus = ignore;
+	}
+
+	bool getIgnoreFocus() noexcept
+	{
+		return m_ignoreFocus;
+	}
+
 signals:
 	void shellFontChanged();
 	void fontError(const QString& msg);
 public slots:
+	void resizeShell(QSize size) noexcept;
 	void resizeShell(int rows, int columns);
 	void setSpecial(const QColor& color);
 	void setBackground(const QColor& color);
@@ -89,9 +114,6 @@ public slots:
 	/// Get the area filled by the cursor
 	QRect neovimCursorRect() const noexcept;
 
-	/// Move the neovim cursor for text insertion and display
-	void setNeovimCursor(uint64_t col, uint64_t row) noexcept;
-
 	virtual void paintEvent(QPaintEvent *ev) Q_DECL_OVERRIDE;
 	virtual void resizeEvent(QResizeEvent *ev) Q_DECL_OVERRIDE;
 
@@ -113,6 +135,8 @@ public slots:
 	QColor m_spColor;
 	int m_lineSpace{ 0 };
 
+	bool m_ignoreFocus{ false };
+
 	Background m_background{ Background::Dark };
 };