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

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
+9 -9
View File
@@ -51,7 +51,7 @@ public:
SplitInput &getInput();
IndirectChannel getIndirectChannel();
ChannelPtr getChannel();
ChannelPtr getChannel() const;
void setChannel(IndirectChannel newChannel);
void setFilters(const QList<QUuid> ids);
@@ -64,8 +64,6 @@ public:
void showChangeChannelPopup(const char *dialogTitle, bool empty,
std::function<void(bool)> callback);
void giveFocus(Qt::FocusReason reason);
bool hasFocus() const;
void updateGifEmotes();
void updateLastReadMessage();
void setIsTopRightSplit(bool value);
@@ -106,7 +104,6 @@ protected:
void resizeEvent(QResizeEvent *event) override;
void enterEvent(QEvent *event) override;
void leaveEvent(QEvent *event) override;
void focusInEvent(QFocusEvent *event) override;
void dragEnterEvent(QDragEnterEvent *event) override;
void dropEvent(QDropEvent *event) override;
@@ -138,11 +135,11 @@ private:
bool isMouseOver_{};
bool isDragging_{};
QVBoxLayout *vbox_;
SplitHeader *header_;
ChannelView *view_;
SplitInput *input_;
SplitOverlay *overlay_;
QVBoxLayout *const vbox_;
SplitHeader *const header_;
ChannelView *const view_;
SplitInput *const input_;
SplitOverlay *const overlay_;
NullablePtr<SelectChannelDialog> selectChannelDialog_;
@@ -179,3 +176,6 @@ public slots:
};
} // namespace chatterino
QDebug operator<<(QDebug dbg, const chatterino::Split &split);
QDebug operator<<(QDebug dbg, const chatterino::Split *split);