Skip to content

Custom scroll bar implementation #982

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

Open
stavrosfa wants to merge 1 commit into
base: Development
Choose a base branch
from
Open

Custom scroll bar implementation #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
191 changes: 190 additions & 1 deletion C7/Lua/civ3/textures.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ local SPACE_RACE = "Art/SpaceShip/"
local POPUP_BORDERS = "Art/popupborders.pcx"

local CURSORS = "Art/Cursor.pcx"
local SCROLL = "Art/SCROLL.PCX"

-- Texture definitions
local textures = {}
Expand Down Expand Up @@ -250,7 +251,195 @@ textures.ui = {
path = CURSORS,
crop_region = { 199, 1, 32, 32 },
}
}
},
scrollbar = {
grabber = {
large = {
path = SCROLL,
crop_region = { 46, 139, 20, 20 },
shadows = false,
},
small = {
path = SCROLL,
crop_region = { 51, 254, 10, 10 },
shadows = false,
},
},
scroll = {
vertical = {
large = {
path = SCROLL,
crop_region = { 9, 139, 20, 20 },
shadows = false,
},
small = {
path = SCROLL,
crop_region = { 14, 249, 10, 20 },
shadows = false,
},
},
horizontal = {
large = {
path = SCROLL,
crop_region = { 9, 380, 20, 20 },
shadows = false,
},
small = {
path = SCROLL,
crop_region = { 119, 385, 20, 10 },
shadows = false,
},
},
},
decrement = {
vertical = {
large = {
normal = {
path = SCROLL,
crop_region = { 2, 25, 20, 20 },
shadows = false,
},
hover = {
path = SCROLL,
crop_region = { 25, 25, 20, 20 },
shadows = false,
},
pressed = {
path = SCROLL,
crop_region = { 48, 25, 20, 20 },
shadows = false,
},
},
small = {
normal = {
path = SCROLL,
crop_region = { 117, 15, 10, 10 },
shadows = false,
},
hover = {
path = SCROLL,
crop_region = { 130, 15, 10, 10 },
shadows = false,
},
pressed = {
path = SCROLL,
crop_region = { 143, 15, 10, 10 },
shadows = false,
},
},
},
horizontal = {
large = {
normal = {
path = SCROLL,
crop_region = { 94, 2, 20, 20 },
shadows = false,
},
hover = {
path = SCROLL,
crop_region = { 94, 25, 20, 20 },
shadows = false,
},
pressed = {
path = SCROLL,
crop_region = { 94, 48, 20, 20 },
shadows = false,
},
},
small = {
normal = {
path = SCROLL,
crop_region = { 169, 2, 10, 10 },
shadows = false,
},
hover = {
path = SCROLL,
crop_region = { 169, 15, 10, 10 },
shadows = false,
},
pressed = {
path = SCROLL,
crop_region = { 169, 28, 10, 10 },
shadows = false,
},
},
},
},
increment = {
vertical = {
large = {
normal = {
path = SCROLL,
crop_region = { 2, 2, 20, 20 },
shadows = false,
},
hover = {
path = SCROLL,
crop_region = { 25, 2, 20, 20 },
shadows = false,
},
pressed = {
path = SCROLL,
crop_region = { 48, 2, 20, 20 },
shadows = false,
},
},
small = {
normal = {
path = SCROLL,
crop_region = { 117, 2, 10, 10 },
shadows = false,
},
hover = {
path = SCROLL,
crop_region = { 130, 2, 10, 10 },
shadows = false,
},
pressed = {
path = SCROLL,
crop_region = { 143, 2, 10, 10 },
shadows = false,
},
},
},
horizontal = {
large = {
normal = {
path = SCROLL,
crop_region = { 71, 2, 20, 20 },
shadows = false,
},
hover = {
path = SCROLL,
crop_region = { 71, 25, 20, 20 },
shadows = false,
},
pressed = {
path = SCROLL,
crop_region = { 71, 48, 20, 20 },
shadows = false,
},
},
small = {
normal = {
path = SCROLL,
crop_region = { 156, 2, 10, 10 },
shadows = false,
},
hover = {
path = SCROLL,
crop_region = { 156, 15, 10, 10 },
shadows = false,
},
pressed = {
path = SCROLL,
crop_region = { 156, 28, 10, 10 },
shadows = false,
},
},
},
},
},
}

textures.terrain = require "textures.terrain"
Expand Down
1 change: 1 addition & 0 deletions C7/Lua/standalone/textures.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ local c7_texture_list = {
"Art/city screen/buildings-small.png",
"Art/city screen/buildings-large.png",
"Art/Cursor.png",
"Art/SCROLL.png",
"Art/interface/box trans color.png",
"Art/SpaceShip/SHIPbackground.png",
"Art/Advisors/trade.png",
Expand Down
6 changes: 3 additions & 3 deletions C7/UIElements/Advisors/DomesticAdvisor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ private HBoxContainer MakeCityRow(City city) {

// Use an empty pany container to make it blank, unlike an HSeparator
PanelContainer hSeparator1 = new();
hSeparator1.CustomMinimumSize = new Vector2(30, 50);
hSeparator1.CustomMinimumSize = new Vector2(30, 45);
hSeparator1.AddThemeStyleboxOverride("panel", new StyleBoxEmpty());
hboxContainer.AddChild(hSeparator1);

Expand Down Expand Up @@ -399,7 +399,7 @@ private HBoxContainer MakeCityRow(City city) {
hboxContainer.AddChild(popuplationContainer);

PanelContainer productionContainer = new();
productionContainer.CustomMinimumSize = new Vector2(50, 0);
productionContainer.CustomMinimumSize = new Vector2(45, 0);
productionContainer.AddThemeStyleboxOverride("panel", new StyleBoxEmpty());
hboxContainer.AddChild(productionContainer);

Expand Down Expand Up @@ -494,7 +494,7 @@ void AddPopHeads(City city, Node node, int maxWidth) {
private int AddCitizen(Node node, CityResident cr, int xPos, int spacer, int eraNum) {
TextureRect tr = new();
tr.Texture = PopHead.GetTexture(cr, eraNum);
tr.SetPosition(new Vector2(xPos, 0));
tr.SetPosition(new Vector2(xPos, -3));
node.AddChild(tr);
return xPos + spacer;
}
Expand Down
Loading
Loading