chatterino2
Code Issues

Fix split focusing being broken in certain circumstances when the "Show input when it's empty" setting was disabled (#3838)

Browse Source 
Co-authored-by: Kasia <zneix@zneix.eu>
This commit is contained in:
pajlada
2022-06-26 18:53:09 +02:00
committed by GitHub
parent 8bdfbf7b87
commit 6599009e79
13 changed files with 151 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/splits/SplitInput.hpp
+37 -6
View File
@@ -32,16 +32,37 @@ public:
QString getInputText() const;
void insertText(const QString &text);
/**
* @brief Hide the widget
*
* This is a no-op if the SplitInput is already hidden
**/
void hide();
/**
* @brief Show the widget
*
* This is a no-op if the SplitInput is already shown
**/
void show();
/**
* @brief Returns the hidden or shown state of the SplitInput
*
* Hidden in this context means "has 0 height", meaning it won't be visible
* but Qt still treats the widget as "technically visible" so we receive events
* as if the widget is visible
**/
bool isHidden() const;
pajlada::Signals::Signal<const QString &> textChanged;
protected:
virtual void scaleChangedEvent(float scale_) override;
virtual void themeChangedEvent() override;
void scaleChangedEvent(float scale_) override;
void themeChangedEvent() override;
virtual void paintEvent(QPaintEvent *) override;
virtual void resizeEvent(QResizeEvent *) override;
virtual void mousePressEvent(QMouseEvent *event) override;
void paintEvent(QPaintEvent * /*event*/) override;
void resizeEvent(QResizeEvent * /*event*/) override;
private:
void addShortcuts() override;
@@ -57,6 +78,10 @@ private:
void insertCompletionText(const QString &text);
void openEmotePopup();
// scaledMaxHeight returns the height in pixels that this widget can grow to
// This does not take hidden into account, so callers must take hidden into account themselves
int scaledMaxHeight() const;
Split *const split_;
QObjectRef<EmotePopup> emotePopup_;
QObjectRef<InputCompletionPopup> inputCompletionPopup_;
@@ -74,6 +99,12 @@ private:
QString currMsg_;
int prevIndex_ = 0;
// Hidden denotes whether this split input should be hidden or not
// This is used instead of the regular QWidget::hide/show because
// focus events don't work as expected, so instead we use this bool and
// set the height of the split input to 0 if we're supposed to be hidden instead
bool hidden{false};
private slots:
void editTextChanged();