Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate global chat with the lobby. #9692

Merged
merged 3 commits into from
Oct 21, 2015
Merged

Conversation

pchote
Copy link
Member

@pchote pchote commented Oct 20, 2015

The next step towards #9451. A future PR will add unread message counts to the tab labels, but that depends on some wider widget refactoring that will come in the next PR.

@pchote pchote added this to the Next release milestone Oct 20, 2015
@obrakmann
Copy link
Contributor

The two 'disconnect' buttons right next to each other irk me. Can we change the label on one of them (I'd probably go with 'Leave [match|game|lobby]')?
screenshot from 2015-10-20 21 13 24

@pchote
Copy link
Member Author

pchote commented Oct 20, 2015

In TD we use "Back" for skirmish, and "Leave Game" for MP. I never noticed that RA used different terminology. I'll change them to match TD, and then use "Leave Chat" for the IRC button.

@pchote pchote force-pushed the lobby-irc branch 2 times, most recently from 05e83fc to 5efa879 Compare October 20, 2015 21:36
@pchote
Copy link
Member Author

pchote commented Oct 20, 2015

Updated.

@Micr0Bit
Copy link
Member

this works 👍

@pchote
Copy link
Member Author

pchote commented Oct 21, 2015

Rebased.

@obrakmann
Copy link
Contributor

What do you think about making the buttons all the same width? It pleases my OCD ;)

screenshot from 2015-10-21 20 47 25

Diff:

index bf0c684..de45eb0 100644
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -124,16 +124,16 @@ Background@SERVER_LOBBY:
                        Width: PARENT_RIGHT - 40
                        Height: 229
                Button@START_GAME_BUTTON:
-                       X: PARENT_RIGHT - WIDTH - 150
+                       X: PARENT_RIGHT - WIDTH - 205
                        Y: PARENT_BOTTOM - HEIGHT - 20
-                       Width: 120
+                       Width: 172
                        Height: 25
                        Text: Start Game
                        Font: Bold
                Button@DISCONNECT_BUTTON:
                        X: PARENT_RIGHT - WIDTH - 20
                        Y: PARENT_BOTTOM - HEIGHT - 20
-                       Width: 120
+                       Width: 172
                        Height: 25
                        Text: Leave Game
                        Font: Bold

@pchote
Copy link
Member Author

pchote commented Oct 21, 2015

The buttons are matched to the map chooser, and (will be matched to) the new server browser, so that ends up being a rather major style change. The current button widths / positions are consistent across most of the UI panels.

@obrakmann
Copy link
Contributor

hmm... ok. maybe we can come up with another solution eventually. for now, 👍

obrakmann added a commit that referenced this pull request Oct 21, 2015
Integrate global chat with the lobby.
@obrakmann obrakmann merged commit a0816b7 into OpenRA:bleed Oct 21, 2015
@obrakmann
Copy link
Contributor

Changelog

@pchote pchote deleted the lobby-irc branch October 21, 2015 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants