Skip to content

Commit e9f6f89

Browse files
committed
Try full-square build icons in integral.
Not sure how well this works, probably needs to be an option for backwards compatibility. It works entirely via the config.
1 parent 1147fa8 commit e9f6f89

4 files changed

Lines changed: 41 additions & 12 deletions

File tree

LuaUI/Configs/integral_menu_config.lua

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,9 @@ end
368368
local textConfig = {
369369
bottomLeft = {
370370
name = "bottomLeft",
371-
x = "15%",
371+
x = "10%",
372372
right = 0,
373-
bottom = 2,
373+
bottom = "10%",
374374
height = 12,
375375
fontsize = 12,
376376
},
@@ -390,8 +390,8 @@ local textConfig = {
390390
},
391391
queue = {
392392
name = "queue",
393-
right = "18%",
394-
bottom = "14%",
393+
right = "15%",
394+
bottom = "15%",
395395
align = "right",
396396
fontsize = 16,
397397
height = 16,
@@ -413,21 +413,21 @@ local buttonLayoutConfig = {
413413
},
414414
build = {
415415
image = {
416-
x = "5%",
417-
y = "4%",
418-
right = "5%",
419-
bottom = 12,
416+
x = 0,
417+
y = 0,
418+
right = 0,
419+
height = "100%",
420420
keepAspect = false,
421421
},
422422
tooltipPrefix = "Build",
423423
showCost = true
424424
},
425425
buildunit = {
426426
image = {
427-
x = "5%",
428-
y = "4%",
429-
right = "5%",
430-
bottom = 12,
427+
x = 0,
428+
y = 0,
429+
right = 0,
430+
height = "100%",
431431
keepAspect = false,
432432
},
433433
tooltipPrefix = "BuildUnit",

LuaUI/Widgets/chili/Skins/Evolved/skin.lua

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,20 @@ skin.button = {
4747
DrawControl = DrawButton,
4848
}
4949

50+
skin.button_hidden = {
51+
TileImageBK = ":cl:tech_button_bright_small_bk.png",
52+
TileImageFG = ":cl:tech_button_bright_small_fg.png",
53+
tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom
54+
padding = {10, 10, 10, 10},
55+
56+
backgroundColor = {0.20, 0.38, 0.46, 0},
57+
focusColor = {0.20, 0.42, 0.50, 0},
58+
borderColor = {0.20, 0.42, 0.50, 0},
59+
pressBackgroundColor = {0.14, 0.365, 0.42, 0},
60+
61+
DrawControl = DrawButton,
62+
}
63+
5064
skin.button_tiny = {
5165
TileImageBK = ":cl:tech_button_bright_tiny_bk.png",
5266
TileImageFG = ":cl:tech_button_bright_tiny_fg.png",

LuaUI/Widgets/chili_old/Skins/Evolved/skin.lua

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,20 @@ skin.button = {
4747
DrawControl = DrawButton,
4848
}
4949

50+
skin.button_hidden = {
51+
TileImageBK = ":cl:tech_button_bright_small_bk.png",
52+
TileImageFG = ":cl:tech_button_bright_small_fg.png",
53+
tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom
54+
padding = {10, 10, 10, 10},
55+
56+
backgroundColor = {0.20, 0.38, 0.46, 0},
57+
focusColor = {0.20, 0.42, 0.50, 0},
58+
borderColor = {0.20, 0.42, 0.50, 0},
59+
pressBackgroundColor = {0.14, 0.365, 0.42, 0},
60+
61+
DrawControl = DrawButton,
62+
}
63+
5064
skin.button_tiny = {
5165
TileImageBK = ":cl:tech_button_bright_tiny_bk.png",
5266
TileImageFG = ":cl:tech_button_bright_tiny_fg.png",

LuaUI/Widgets/gui_chili_integral_menu.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,7 @@ local function GetButton(parent, name, selectionIndex, x, y, xStr, yStr, width,
12141214
objectOverrideFont = WG.GetFont(14),
12151215
padding = {0, 0, 0, 0},
12161216
parent = parent,
1217+
classname = buttonLayout.noDraw and "button_hidden" or nil,
12171218
preserveChildrenOrder = true,
12181219
OnClick = {DoClick},
12191220
}

0 commit comments

Comments
 (0)