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.

Sign up for GitHub

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

Lan Lobby Window Layout Update (ControlBarPro Merge & UI Symmetry Fix) #2576

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Lan Lobby Window Layout Update (ControlBarPro Merge & UI Symmetry Fix) #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed14fc7
Merge ControlBarPro version
DevGeniusCode Jan 4, 2025
57941bc
Fixed UI symmetry, adjusted player list and map name, and smaller fon…
DevGeniusCode Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions Patch104pZH/GameFilesEdited/Window/Menus/GameInfoWindow.wnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ STARTLAYOUTBLOCK
ENDLAYOUTBLOCK
WINDOW
WINDOWTYPE = USER;
SCREENRECT = UPPERLEFT: 288 128,
BOTTOMRIGHT: 520 308,
SCREENRECT = UPPERLEFT: 420 75,
BOTTOMRIGHT: 620 340,
CREATIONRESOLUTION: 800 600;
NAME = "GameInfoWindow.wnd:ParentGameInfo";
STATUS = ENABLED;
Expand All @@ -22,7 +22,7 @@ WINDOW
TEXTCOLOR = ENABLED: 255 255 255 0, ENABLEDBORDER: 255 255 255 0,
DISABLED: 255 255 255 0, DISABLEDBORDER: 255 255 255 0,
HILITE: 255 255 255 0, HILITEBORDER: 255 255 255 0;
ENABLEDDRAWDATA = IMAGE: BlackSquare, COLOR: 0 0 0 128, BORDERCOLOR: 49 55 167 255,
ENABLEDDRAWDATA = IMAGE: BlackSquare, COLOR: 0 0 0 128, BORDERCOLOR: 49 55 167 255,
IMAGE: NoImage, COLOR: 255 255 255 0, BORDERCOLOR: 255 255 255 0,
IMAGE: NoImage, COLOR: 255 255 255 0, BORDERCOLOR: 255 255 255 0,
IMAGE: NoImage, COLOR: 255 255 255 0, BORDERCOLOR: 255 255 255 0,
Expand Down Expand Up @@ -52,8 +52,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = SCROLLLISTBOX;
SCREENRECT = UPPERLEFT: 292 196,
BOTTOMRIGHT: 516 304,
SCREENRECT = UPPERLEFT: 421 160,
BOTTOMRIGHT: 619 339,
CREATIONRESOLUTION: 800 600;
NAME = "GameInfoWindow.wnd:ListBoxPlayers";
STATUS = ENABLED;
Expand Down Expand Up @@ -99,7 +99,7 @@ WINDOW
LISTBOXDATA = LENGTH: 9,
AUTOSCROLL: 0,
AUTOPURGE: 0,
SCROLLBAR: 1,
SCROLLBAR: 0,
MULTISELECT: 0,
COLUMNS: 2,
COLUMNSWIDTH: 15,
Expand Down Expand Up @@ -217,8 +217,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 292 132,
BOTTOMRIGHT: 360 152,
SCREENRECT = UPPERLEFT: 421 78,
BOTTOMRIGHT: 465 90,
CREATIONRESOLUTION: 800 600;
NAME = "GameInfoWindow.wnd:";
STATUS = ENABLED;
Expand Down Expand Up @@ -266,8 +266,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 292 176,
BOTTOMRIGHT: 406 196,
SCREENRECT = UPPERLEFT: 421 140,
BOTTOMRIGHT: 475 155,
CREATIONRESOLUTION: 800 600;
NAME = "GameInfoWindow.wnd:";
STATUS = ENABLED;
Expand Down Expand Up @@ -315,8 +315,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 292 152,
BOTTOMRIGHT: 360 180,
SCREENRECT = UPPERLEFT: 421 95,
BOTTOMRIGHT: 465 135,
CREATIONRESOLUTION: 800 600;
NAME = "GameInfoWindow.wnd:";
STATUS = ENABLED;
Expand Down Expand Up @@ -364,8 +364,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 360 152,
BOTTOMRIGHT: 516 180,
SCREENRECT = UPPERLEFT: 473 95,
BOTTOMRIGHT: 619 135,
CREATIONRESOLUTION: 800 600;
NAME = "GameInfoWindow.wnd:StaticTextMapName";
STATUS = ENABLED;
Expand Down Expand Up @@ -414,8 +414,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 360 132,
BOTTOMRIGHT: 516 152,
SCREENRECT = UPPERLEFT: 473 78,
BOTTOMRIGHT: 619 90,
CREATIONRESOLUTION: 800 600;
NAME = "GameInfoWindow.wnd:StaticTextGameName";
STATUS = ENABLED;
Expand Down Expand Up @@ -462,4 +462,4 @@ WINDOW
STATICTEXTDATA = CENTERED: 0;
END
ENDALLCHILDREN
END
END
87 changes: 45 additions & 42 deletions Patch104pZH/GameFilesEdited/Window/Menus/LanLobbyMenu.wnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENDLAYOUTBLOCK
WINDOW
WINDOWTYPE = USER;
SCREENRECT = UPPERLEFT: 0 0,
BOTTOMRIGHT: 799 600,
BOTTOMRIGHT: 800 600,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:LanLobbyMenuParent";
STATUS = ENABLED+IMAGE;
Expand Down Expand Up @@ -52,8 +52,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = USER;
SCREENRECT = UPPERLEFT: 41 41,
BOTTOMRIGHT: 759 558,
SCREENRECT = UPPERLEFT: 42 42,
BOTTOMRIGHT: 759 559,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:GadgetParent";
STATUS = ENABLED;
Expand Down Expand Up @@ -98,8 +98,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 52 80,
BOTTOMRIGHT: 213 104,
SCREENRECT = UPPERLEFT: 422 343,
BOTTOMRIGHT: 619 373,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:";
STATUS = ENABLED+NOINPUT+NOFOCUS;
Expand Down Expand Up @@ -147,8 +147,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = PUSHBUTTON;
SCREENRECT = UPPERLEFT: 576 507,
BOTTOMRIGHT: 747 543,
SCREENRECT = UPPERLEFT: 420 403,
BOTTOMRIGHT: 620 438,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ButtonBack";
STATUS = ENABLED+IMAGE;
Expand Down Expand Up @@ -195,8 +195,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = PUSHBUTTON;
SCREENRECT = UPPERLEFT: 54 507,
BOTTOMRIGHT: 225 543,
SCREENRECT = UPPERLEFT: 420 443,
BOTTOMRIGHT: 620 478,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ButtonHost";
STATUS = ENABLED+IMAGE;
Expand Down Expand Up @@ -243,8 +243,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = PUSHBUTTON;
SCREENRECT = UPPERLEFT: 228 507,
BOTTOMRIGHT: 399 543,
SCREENRECT = UPPERLEFT: 420 483,
BOTTOMRIGHT: 620 518,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ButtonJoin";
STATUS = ENABLED+IMAGE;
Expand Down Expand Up @@ -291,8 +291,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = PUSHBUTTON;
SCREENRECT = UPPERLEFT: 402 507,
BOTTOMRIGHT: 574 543,
SCREENRECT = UPPERLEFT: 420 523,
BOTTOMRIGHT: 620 558,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ButtonDirectConnect";
STATUS = ENABLED+IMAGE;
Expand Down Expand Up @@ -339,8 +339,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = ENTRYFIELD;
SCREENRECT = UPPERLEFT: 217 81,
BOTTOMRIGHT: 417 106,
SCREENRECT = UPPERLEFT: 421 374,
BOTTOMRIGHT: 545 398,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:TextEntryPlayerName";
STATUS = ENABLED+IMAGE;
Expand Down Expand Up @@ -392,8 +392,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = SCROLLLISTBOX;
SCREENRECT = UPPERLEFT: 53 131,
BOTTOMRIGHT: 274 311,
SCREENRECT = UPPERLEFT: 292 75,
BOTTOMRIGHT: 420 558,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ListboxPlayers";
STATUS = ENABLED+NOFOCUS;
Expand Down Expand Up @@ -442,6 +442,7 @@ WINDOW
SCROLLBAR: 1,
MULTISELECT: 0,
COLUMNS: 1,
COLUMNSWIDTH: 30,
FORCESELECT: 0;
LISTBOXENABLEDUPBUTTONDRAWDATA = IMAGE: VSliderUpButtonEnabled, COLOR: 255 0 0 255, BORDERCOLOR: 255 128 128 255,
IMAGE: VSliderUpButtonHiliteSelected, COLOR: 255 255 0 255, BORDERCOLOR: 254 254 254 255,
Expand Down Expand Up @@ -555,8 +556,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 53 103,
BOTTOMRIGHT: 309 131,
SCREENRECT = UPPERLEFT: 292 49,
BOTTOMRIGHT: 420 75,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:";
STATUS = ENABLED+NOINPUT+NOFOCUS;
Expand Down Expand Up @@ -604,8 +605,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 275 103,
BOTTOMRIGHT: 515 131,
SCREENRECT = UPPERLEFT: 620 49,
BOTTOMRIGHT: 758 75,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:";
STATUS = ENABLED+NOINPUT+NOFOCUS;
Expand Down Expand Up @@ -653,8 +654,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = SCROLLLISTBOX;
SCREENRECT = UPPERLEFT: 277 131,
BOTTOMRIGHT: 517 311,
SCREENRECT = UPPERLEFT: 620 75,
BOTTOMRIGHT: 758 558,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ListboxGames";
STATUS = ENABLED+NOFOCUS;
Expand All @@ -664,7 +665,7 @@ WINDOW
TOOLTIPCALLBACK = "[None]";
DRAWCALLBACK = "[None]";
FONT = NAME: "Arial", SIZE: 10, BOLD: 0;
HEADERTEMPLATE = "LabelRegular";
HEADERTEMPLATE = "LabelSmall";
TOOLTIPDELAY = -1;
TEXTCOLOR = ENABLED: 254 254 254 255, ENABLEDBORDER: 0 0 0 255,
DISABLED: 192 192 192 255, DISABLEDBORDER: 64 64 64 255,
Expand Down Expand Up @@ -703,6 +704,7 @@ WINDOW
SCROLLBAR: 1,
MULTISELECT: 0,
COLUMNS: 1,
COLUMNSWIDTH: 30,
FORCESELECT: 0;
LISTBOXENABLEDUPBUTTONDRAWDATA = IMAGE: VSliderUpButtonEnabled, COLOR: 255 0 0 255, BORDERCOLOR: 255 128 128 255,
IMAGE: VSliderUpButtonHiliteSelected, COLOR: 255 255 0 255, BORDERCOLOR: 254 254 254 255,
Expand Down Expand Up @@ -816,8 +818,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 521 130,
BOTTOMRIGHT: 753 310,
SCREENRECT = UPPERLEFT: 420 75,
BOTTOMRIGHT: 620 340,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:StaticTextGameInfo";
STATUS = ENABLED+NOINPUT+NOFOCUS;
Expand Down Expand Up @@ -864,8 +866,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 521 103,
BOTTOMRIGHT: 709 127,
SCREENRECT = UPPERLEFT: 420 49,
BOTTOMRIGHT: 620 75,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:";
STATUS = ENABLED+NOINPUT+NOFOCUS;
Expand Down Expand Up @@ -913,8 +915,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = SCROLLLISTBOX;
SCREENRECT = UPPERLEFT: 52 315,
BOTTOMRIGHT: 751 462,
SCREENRECT = UPPERLEFT: 43 75,
BOTTOMRIGHT: 292 530,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ListboxChatWindowLanLobby";
STATUS = ENABLED+NOFOCUS;
Expand Down Expand Up @@ -963,6 +965,7 @@ WINDOW
SCROLLBAR: 1,
MULTISELECT: 0,
COLUMNS: 1,
COLUMNSWIDTH: 30,
FORCESELECT: 0;
LISTBOXENABLEDUPBUTTONDRAWDATA = IMAGE: VSliderUpButtonEnabled, COLOR: 255 0 0 255, BORDERCOLOR: 255 128 128 255,
IMAGE: VSliderUpButtonHiliteSelected, COLOR: 255 255 0 255, BORDERCOLOR: 254 254 254 255,
Expand Down Expand Up @@ -1076,8 +1079,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = ENTRYFIELD;
SCREENRECT = UPPERLEFT: 53 469,
BOTTOMRIGHT: 690 493,
SCREENRECT = UPPERLEFT: 43 534,
BOTTOMRIGHT: 250 558,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:TextEntryChat";
STATUS = ENABLED+IMAGE;
Expand Down Expand Up @@ -1129,8 +1132,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = PUSHBUTTON;
SCREENRECT = UPPERLEFT: 420 81,
BOTTOMRIGHT: 491 106,
SCREENRECT = UPPERLEFT: 546 374,
BOTTOMRIGHT: 619 398,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ButtonClear";
STATUS = ENABLED+IMAGE;
Expand All @@ -1140,7 +1143,7 @@ WINDOW
TOOLTIPCALLBACK = "[None]";
DRAWCALLBACK = "[None]";
FONT = NAME: "Generals", SIZE: 15, BOLD: 0;
HEADERTEMPLATE = "MainButton";
HEADERTEMPLATE = "ButtonSmall";
TOOLTIPTEXT = "TOOLTIP:ButtonClear";
TOOLTIPDELAY = -1;
TEXT = "GUI:CLEAR";
Expand Down Expand Up @@ -1178,8 +1181,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = PUSHBUTTON;
SCREENRECT = UPPERLEFT: 714 467,
BOTTOMRIGHT: 750 491,
SCREENRECT = UPPERLEFT: 253 534,
BOTTOMRIGHT: 292 558,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:ButtonEmote";
STATUS = ENABLED+IMAGE;
Expand Down Expand Up @@ -1225,8 +1228,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = STATICTEXT;
SCREENRECT = UPPERLEFT: 47 43,
BOTTOMRIGHT: 655 76,
SCREENRECT = UPPERLEFT: 43 42,
BOTTOMRIGHT: 658 75,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:";
STATUS = ENABLED;
Expand Down Expand Up @@ -1274,8 +1277,8 @@ WINDOW
CHILD
WINDOW
WINDOWTYPE = USER;
SCREENRECT = UPPERLEFT: 41 75,
BOTTOMRIGHT: 759 76,
SCREENRECT = UPPERLEFT: 43 75,
BOTTOMRIGHT: 758 76,
CREATIONRESOLUTION: 800 600;
NAME = "LanLobbyMenu.wnd:Line";
STATUS = ENABLED;
Expand Down Expand Up @@ -1321,4 +1324,4 @@ WINDOW
ENDALLCHILDREN
END
ENDALLCHILDREN
END
END