games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Lobby: 4:3 and wide layout

Browse Source
This commit is contained in:
Laserlicht
2025-02-25 21:25:01 +01:00
parent eeef7efac5
commit ac5988a643
3 changed files with 214 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/globalLobby/GlobalLobbyClient.cpp
View File

@@ -477,7 +477,7 @@ std::shared_ptr<GlobalLobbyLoginWindow> GlobalLobbyClient::createLoginWindow()
std::shared_ptr<GlobalLobbyWindow> GlobalLobbyClient::createLobbyWindow()
{
auto lobbyWindowPtr = lobbyWindow.lock();
if(lobbyWindowPtr)
if(lobbyWindowPtr && GH.screenDimensions().x >= lobbyWindowPtr->pos.w) // if wide window doesn't fit anymore after ingame screen resolution change
return lobbyWindowPtr;
lobbyWindowPtr = std::make_shared<GlobalLobbyWindow>();

2
client/globalLobby/GlobalLobbyWidget.cpp
View File

@@ -44,7 +44,7 @@ GlobalLobbyWidget::GlobalLobbyWidget(GlobalLobbyWindow * window)
REGISTER_BUILDER("lobbyItemList", &GlobalLobbyWidget::buildItemList);
const JsonNode config(JsonPath::builtin("config/widgets/lobbyWindow.json"));
const JsonNode config(JsonPath::builtin(GH.screenDimensions().x >= 1024 ? "config/widgets/lobbyWindowWide.json" : "config/widgets/lobbyWindow.json"));
build(config);
}

212
config/widgets/lobbyWindowWide.json Normal file
View File

@@ -0,0 +1,212 @@
{
"customTypes" : {
"labelTitleMain" : {
"type": "label",
"font": "big",
"alignment": "left",
"color": "yellow"
},
"labelTitle" : {
"type": "label",
"font": "small",
"alignment": "left",
"color": "yellow"
},
"backgroundTexture" : {
"type": "texture",
"font": "tiny",
"color" : "blue",
"image": "DIBOXBCK"
},
"areaFilled":{
"type": "transparentFilledRectangle",
"color": [0, 0, 0, 75],
"colorLine": [64, 80, 128, 255]
}
},
"width": 1024,
"height": 600,
"items":
[
{
"type": "backgroundTexture",
"rect": {"w": 1024, "h": 600}
},
{
"type": "areaFilled",
"rect": {"x": 5, "y": 5, "w": 250, "h": 40}
},
{
"name" : "accountNameLabel",
"type": "labelTitleMain",
"position": {"x": 15, "y": 10},
"maxWidth": 230
},
{
"type": "areaFilled",
"rect": {"x": 5, "y": 50, "w": 250, "h": 500}
},
{
"name" : "headerRoomList",
"type": "labelTitle",
"position": {"x": 15, "y": 53}
},
{
"type" : "lobbyItemList",
"name" : "roomList",
"itemType" : "room",
"position" : { "x" : 7, "y" : 68 },
"itemOffset" : { "x" : 0, "y" : 40 },
"sliderPosition" : { "x" : 230, "y" : 0 },
"sliderSize" : { "x" : 480, "y" : 480 },
"visibleAmount" : 12
},
{
"type": "areaFilled",
"rect": {"x": 270, "y": 50, "w": 150, "h": 180}
},
{
"name" : "headerChannelList",
"type": "labelTitle",
"position": {"x": 280, "y": 53}
},
{
"type" : "lobbyItemList",
"name" : "channelList",
"itemType" : "channel",
"position" : { "x" : 272, "y" : 68 },
"itemOffset" : { "x" : 0, "y" : 40 },
"visibleAmount" : 4
},
{
"type": "areaFilled",
"rect": {"x": 270, "y": 250, "w": 150, "h": 340}
},
{
"name" : "headerMatchList",
"type": "labelTitle",
"position": {"x": 280, "y": 253}
},
{
"type" : "lobbyItemList",
"name" : "matchList",
"itemType" : "match",
"position" : { "x" : 272, "y" : 268 },
"itemOffset" : { "x" : 0, "y" : 40 },
"sliderPosition" : { "x" : 130, "y" : 0 },
"sliderSize" : { "x" : 320, "y" : 320 },
"visibleAmount" : 8
},
{
"type": "areaFilled",
"rect": {"x": 430, "y": 50, "w": 430, "h": 515}
},
{
"name" : "headerGameChat",
"type": "labelTitle",
"position": {"x": 440, "y": 53},
"maxWidth": 418
},
{
"type": "textBox",
"name": "gameChat",
"font": "small",
"alignment": "left",
"color": "white",
"blueTheme" : true,
"rect": {"x": 440, "y": 68, "w": 418, "h": 495}
},
{
"type": "areaFilled",
"rect": {"x": 430, "y": 565, "w": 397, "h": 25}
},
{
"name" : "messageInput",
"type": "textInput",
"rect": {"x": 440, "y": 568, "w": 377, "h": 20}
},
{
"type": "areaFilled",
"rect": {"x": 870, "y": 50, "w": 150, "h": 540}
},
{
"name": "headerAccountList",
"type": "labelTitle",
"position": {"x": 880, "y": 53}
},
{
"type" : "lobbyItemList",
"name" : "accountList",
"itemType" : "account",
"position" : { "x" : 872, "y" : 68 },
"itemOffset" : { "x" : 0, "y" : 40 },
"sliderPosition" : { "x" : 130, "y" : 0 },
"sliderSize" : { "x" : 520, "y" : 520 },
"visibleAmount" : 13
},
{
"type": "button",
"position": {"x": 870, "y": 10},
"image": "lobbyHideWindow",
"help": "core.help.288",
"callback": "closeWindow",
"hotkey": "globalCancel",
"items":
[
{
"type": "label",
"font": "medium",
"alignment": "center",
"color": "yellow",
"text": "core.help.561.hover" // Back
}
]
},
{
"type": "button",
"position": {"x": 827, "y": 565},
"image": "lobbySendMessage",
"help": "vcmi.lobby.channel.sendMessage",
"callback": "sendMessage",
"hotkey": "globalAccept",
"items":
[
{
"type": "picture",
"image": "lobby/iconSend"
}
]
},
{
"type": "button",
"position": {"x": 5, "y": 555},
"image": "lobbyCreateRoom",
"help": "vcmi.lobby.room.create",
"callback": "createGameRoom",
"items":
[
{
"type": "label",
"font": "medium",
"alignment": "center",
"color": "yellow",
"text": "vcmi.lobby.room.create.hover"
}
]
},
]
}