jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-14 19:18:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Selecting game already open in a tab brings user to that tab. (#4653)

Browse source 
* When trying to join a game from GameSelector that's already been joined by you, navigate to its game tab.

* return immediately, do not change button states

Co-authored-by: ebbit1q <ebbit1q@gmail.com>
This commit is contained in:
Antoine Dahan 2022-10-29 09:46:50 -04:00 • committed by GitHub
parent 8e4ddf366c
commit 72743e834e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/chatview/chatview.cpp
View file

@ -21,7 +21,7 @@ UserMessagePosition::UserMessagePosition(QTextCursor &cursor)
relativePosition = cursor.position() - block.position();
}
ChatView::ChatView(const TabSupervisor *_tabSupervisor,
ChatView::ChatView(TabSupervisor *_tabSupervisor,
const UserlistProxy *_userlistProxy,
TabGame *_game,
bool _showTimestamps,

4
cockatrice/src/chatview/chatview.h
View file

@ -33,7 +33,7 @@ class ChatView : public QTextBrowser
{
Q_OBJECT
protected:
const TabSupervisor *const tabSupervisor;
TabSupervisor *const tabSupervisor;
TabGame *const game;
private:
@ -83,7 +83,7 @@ private slots:
void actMessageClicked();
public:
ChatView(const TabSupervisor *_tabSupervisor,
ChatView(TabSupervisor *_tabSupervisor,
const UserlistProxy *_userlistProxy,
TabGame *_game,
bool _showTimestamps,