Skip to content

Commit fc957d2

Browse files
frosch123frosch123
committed
Fix: Alignment of GUI icons that have different sizes in 1x and 2x zoom.
1 parent 60acbd5 commit fc957d2

File tree

6 files changed

+44
-43
lines changed

6 files changed

+44
-43
lines changed

‎sprites/base/base-0000-font.pnml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ alternative_sprites (spr140, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/
147147
base_graphics spr141( 141, "sprites/png/gui/fonts.png") { [ 530, 130, 8, 13, 0, -2] }
148148
base_graphics spr142( 142, "sprites/png/gui/fonts.png") { [ 550, 130, 12, 13, 0, -2] }
149149
alternative_sprites (spr142, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_caption(402,776) }
150-
base_graphics spr143( 143, "sprites/png/gui/fonts.png") { [ 570, 130, 8, 13, 0, -2] }
150+
base_graphics spr143( 143, "sprites/png/gui/fonts.png") { [ 570, 130, 8, 13, 1, -2] }
151151
alternative_sprites (spr143, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_caption(434,776) }
152152
base_graphics spr144( 144, "sprites/png/gui/fonts.png") { [ 590, 130, 10, 13, 0, -2] }
153153
base_graphics spr145( 145, "sprites/png/gui/fonts.png") { [ 610, 130, 5, 13, 0, -2] }

‎sprites/base/base-1005-rail-infra.pnml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ alternative_sprites (spr1291, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui
260260
alternative_sprites (spr1294, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(338, 264) }
261261
alternative_sprites (spr1295, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(386, 264) }
262262

263-
alternative_sprites (spr1298, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(482, 264) }
263+
alternative_sprites (spr1298, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(482, 264, 0) }
264264
alternative_sprites (spr1299, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(578, 264) }
265265

266266
//1301-1308 rail fences

‎sprites/base/base-2437-bridges.pnml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,12 @@ base_graphics spr2598(2598, "sprites/png/gui/gui04.png") { [ 194, 1001, 43, 20
166166
base_graphics spr2599(2599, "sprites/png/gui/gui04.png") { [ 242, 1001, 43, 20, 0, 0] }
167167
base_graphics spr2600(2600, "sprites/png/gui/gui04.png") { [ 290, 1001, 43, 20, 0, 0] }
168168
//TODO: sprite 2593
169-
alternative_sprites (spr2594, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(162, 328) }
170-
alternative_sprites (spr2595, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(258, 328) }
171-
alternative_sprites (spr2596, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(354, 328) }
172-
alternative_sprites (spr2597, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(446, 328) }
173-
alternative_sprites (spr2598, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(538, 328) }
174-
alternative_sprites (spr2599, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(630, 328) }
175-
alternative_sprites (spr2600, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide( 2, 392) }
169+
170+
// 1x sprites are 43x20, 2x sprites are 80x40. Use xoffs 3 to make them both centered.
171+
alternative_sprites (spr2594, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(162, 328, 3) }
172+
alternative_sprites (spr2595, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(258, 328, 3) }
173+
alternative_sprites (spr2596, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(354, 328, 3) }
174+
alternative_sprites (spr2597, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(446, 328, 3) }
175+
alternative_sprites (spr2598, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(538, 328, 3) }
176+
alternative_sprites (spr2599, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide(630, 328, 3) }
177+
alternative_sprites (spr2600, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar_wide( 2, 392, 3) }

‎sprites/base/base-4077-gui-toolbar-pointer.pnml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
//4077-4089 more gui stuff
2-
base_graphics spr4077(4077, "sprites/png/gui/gui04.png") { [ 450, 280, 20, 20, 0, 0] }
3-
base_graphics spr4078(4078, "sprites/png/gui/gui04.png") { [ 482, 280, 8, 8, -3, -4] }
4-
base_graphics spr4079(4079, "sprites/png/gui/gui04.png") { [ 498, 280, 3, 3, -1, -1] }
5-
base_graphics spr4080(4080, "sprites/png/gui/gui04.png") { [ 514, 280, 32, 32, 0, 0] }
6-
base_graphics spr4081(4081, "sprites/png/gui/gui04.png") { [ 562, 280, 32, 32, 0, 0] }
7-
base_graphics spr4082(4082, "sprites/png/gui/gui04.png") { [ 610, 280, 20, 20, 0, 0] }
8-
base_graphics spr4083(4083, "sprites/png/gui/gui04.png") { [ 642, 280, 20, 20, 0, 0] }
9-
base_graphics spr4084(4084, "sprites/png/gui/gui04.png") { [ 674, 280, 20, 20, 0, 0] }
10-
base_graphics spr4085(4085, "sprites/png/gui/gui04.png") { [ 706, 280, 20, 20, 0, 0] }
11-
base_graphics spr4086(4086, "sprites/png/gui/gui04.png") { [ 738, 280, 20, 20, 0, 0] }
12-
base_graphics spr4087(4087, "sprites/png/gui/gui04.png") { [ 2, 328, 32, 32, 0, 0] }
13-
base_graphics spr4088(4088, "sprites/png/gui/gui04.png") { [ 50, 328, 32, 32, 0, 0] }
14-
base_graphics spr4089(4089, "sprites/png/gui/gui04.png") { [ 98, 328, 32, 32, 0, 0] }
2+
base_graphics spr4077(4077, "sprites/png/gui/gui04.png") { [ 450, 280, 20, 20, 0, 0] } // towns
3+
base_graphics spr4078(4078, "sprites/png/gui/gui04.png") { [ 482, 280, 8, 8, -3, -4] } // terraform dot
4+
base_graphics spr4079(4079, "sprites/png/gui/gui04.png") { [ 498, 280, 3, 3, -1, -1] } // scenario editor toolsize dot
5+
base_graphics spr4080(4080, "sprites/png/gui/gui04.png") { [ 514, 280, 32, 32, 0, 0] } // build town cursor
6+
base_graphics spr4081(4081, "sprites/png/gui/gui04.png") { [ 562, 280, 32, 32, 0, 0] } // build industry cursor
7+
base_graphics spr4082(4082, "sprites/png/gui/gui04.png") { [ 610, 280, 20, 20, 0, 0] } // build sign
8+
base_graphics spr4083(4083, "sprites/png/gui/gui04.png") { [ 642, 280, 20, 20, 0, 0] } // smallmap
9+
base_graphics spr4084(4084, "sprites/png/gui/gui04.png") { [ 674, 280, 20, 20, 0, 0] } // rocky land
10+
base_graphics spr4085(4085, "sprites/png/gui/gui04.png") { [ 706, 280, 20, 20, 0, 0] } // lighthouse
11+
base_graphics spr4086(4086, "sprites/png/gui/gui04.png") { [ 738, 280, 20, 20, 0, 0] } // transmitter
12+
base_graphics spr4087(4087, "sprites/png/gui/gui04.png") { [ 2, 328, 32, 32, 0, 0] } // rocky land cursor
13+
base_graphics spr4088(4088, "sprites/png/gui/gui04.png") { [ 50, 328, 32, 32, 0, 0] } // lighthouse cursor
14+
base_graphics spr4089(4089, "sprites/png/gui/gui04.png") { [ 98, 328, 32, 32, 0, 0] } // transmitter cursor
1515
alternative_sprites (spr4077, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar( 98, 392) }
1616
//TODO sprite 4078-4081
1717
alternative_sprites (spr4082, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(146, 392) }
1818
alternative_sprites (spr4083, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(194, 392) }
1919
alternative_sprites (spr4084, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(242, 392) }
2020
alternative_sprites (spr4085, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(290, 392) }
2121
alternative_sprites (spr4086, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(338, 392) }
22-
alternative_sprites (spr4087, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP, "sprites/png/gui/gui2x.png") { tmpl_gui2x_toolbar(386, 392) }
23-
//TODO sprite 4088-4089
22+
//TODO sprite 4087-4089

‎sprites/extra/extra-openttd-gui.pnml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ replacenew ottd_gui1(OTTD_GUI, "") {
4848

4949
replacenew ottd_gui2(OTTD_GUI, "", 38) {
5050
[ 786, 632, 10, 10, 0, 0, "sprites/png/gui/gui04.png"] // newgrf settings: square status icon
51-
[ 2, 696, 8, 8, 0, 0, "sprites/png/gui/gui04.png"] // server join menu: circular status icon
52-
[ 18, 696, 7, 9, 0, 0, "sprites/png/gui/gui04.png"] // server join menu: password protected
53-
[ 34, 696, 9, 7, 0, 0, "sprites/png/gui/gui04.png"] // content download menu: empty check box
54-
[ 50, 696, 9, 7, 0, 0, "sprites/png/gui/gui04.png"] // content download menu: checked check box
51+
[ 2, 696, 8, 8, 1, 1, "sprites/png/gui/gui04.png"] // server join menu: circular status icon
52+
[ 18, 696, 7, 9, 1, 0, "sprites/png/gui/gui04.png"] // server join menu: password protected
53+
[ 34, 696, 9, 7, 0, 1, "sprites/png/gui/gui04.png"] // content download menu: empty check box
54+
[ 50, 696, 9, 7, 0, 1, "sprites/png/gui/gui04.png"] // content download menu: checked check box
5555
[ 66, 696, 10, 10, 0, 0, "sprites/png/gui/gui04.png"] // newgrf settings: warning icon
56-
[ 82, 696, 7, 7, 0, 0, "sprites/png/gui/gui04.png"] // window decoration: resize (ltr languages)
56+
[ 82, 696, 7, 7, 3, 3, "sprites/png/gui/gui04.png"] // window decoration: resize (ltr languages)
5757
[ 98, 696, 7, 4, 1, 2, "sprites/png/gui/gui04.png"] // window decoration: arrow up
5858
[ 114, 696, 7, 4, 1, 2, "sprites/png/gui/gui04.png"] // window decoration: arrow down
5959
[ 130, 696, 4, 7, 1, 1, "sprites/png/gui/gui04.png"] // window decoration: arrow left
6060
[ 146, 696, 4, 7, 2, 1, "sprites/png/gui/gui04.png"] // window decoration: arrow right
6161
[ 162, 696, 8, 8, 1, 1, "sprites/png/gui/gui04.png"] // window decoration: go to default directory
6262
[ 178, 696, 9, 9, 1, 0, "sprites/png/gui/gui04.png"] // window decoration: (?) list (?)
63-
[ 194, 696, 7, 8, 0, 0, "sprites/png/gui/gui04.png"] // window decoration: sticky window
64-
[ 210, 696, 8, 8, 0, 0, "sprites/png/gui/gui04.png"] // window decoration: make window sticky
63+
[ 194, 696, 7, 8, 1, 1, "sprites/png/gui/gui04.png"] // window decoration: sticky window
64+
[ 210, 696, 8, 8, 1, 1, "sprites/png/gui/gui04.png"] // window decoration: make window sticky
6565
[ 226, 696, 20, 20, 0, 0, "sprites/png/gui/gui04.png"] // rail toolbar: autorail normal rail
6666
}
6767
alternative_sprites (ottd_gui2, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP) {
@@ -238,12 +238,12 @@ replacenew ottd_gui137(OTTD_GUI, "", 137) {
238238
[ 290, 904, 32, 32, 0, 0, "sprites/png/gui/gui04.png"] // cursor waterways: build rivers
239239
}
240240
replacenew ottd_gui138(OTTD_GUI, "", 138) {
241-
[ 338, 904, 7, 7, 3, 4, "sprites/png/gui/gui04.png"] // (?) arrow left
242-
[ 354, 904, 7, 7, 3, 4, "sprites/png/gui/gui04.png"] // (?) arrow right
243-
[ 370, 904, 10, 9, 2, 3, "sprites/png/gui/gui04.png"] // (?) arrow down
244-
[ 386, 904, 10, 9, 2, 3, "sprites/png/gui/gui04.png"] // (?) arrow up
245-
[ 402, 904, 11, 7, 2, 1, "sprites/png/gui/gui04.png"] // (?) arrow left
246-
[ 418, 904, 9, 9, 3, 3, "sprites/png/gui/gui04.png"] // (?) command symbol
241+
[ 338, 904, 7, 7, 1, 3, "sprites/png/gui/gui04.png"] // (?) arrow left
242+
[ 354, 904, 7, 7, 2, 3, "sprites/png/gui/gui04.png"] // (?) arrow right
243+
[ 370, 904, 10, 9, 0, 1, "sprites/png/gui/gui04.png"] // (?) arrow down
244+
[ 386, 904, 10, 9, 0, 0, "sprites/png/gui/gui04.png"] // (?) arrow up
245+
[ 402, 904, 11, 7, 0, 1, "sprites/png/gui/gui04.png"] // (?) arrow left
246+
[ 418, 904, 9, 9, 0, 0, "sprites/png/gui/gui04.png"] // (?) command symbol
247247
[ 434, 904, 20, 20, 0, 0, "sprites/png/gui/gui04.png"] // main toolbar: switch toolbars
248248
[ 466, 904, 20, 20, 0, 0, "sprites/png/gui/gui04.png"] // waterways toolbar: build aquaduct
249249
}
@@ -263,10 +263,10 @@ replacenew ottd_gui146(OTTD_GUI, "", 146) {
263263
replacenew ottd_gui147(OTTD_GUI, "", 147) {
264264
[ 0, 0, 10, 10, 0, 0, "sprites/png/extra/extra-gui-plus-minus.png"] // (?)
265265
[ 16, 0, 10, 10, 0, 0, "sprites/png/extra/extra-gui-plus-minus.png"] // (?)
266-
[ 82, 705, 7, 7, 0, 0, "sprites/png/gui/gui04.png"] // window decorations: resize window (rtl languages)
266+
[ 82, 705, 7, 7, 0, 3, "sprites/png/gui/gui04.png"] // window decorations: resize window (rtl languages)
267267
[ 2, 125, 20, 20, 0, 0, "sprites/png/gui/gui04.png"] // juke box: play (rtl languages)
268-
[ 242, 352, 7, 8, 0, 0, "sprites/png/gui/gui04.png"] // (?) to bottom
269-
[ 256, 352, 7, 8, 0, 0, "sprites/png/gui/gui04.png"] // (?) to top
268+
[ 242, 352, 7, 8, 1, 1, "sprites/png/gui/gui04.png"] // (?) to bottom
269+
[ 256, 352, 7, 8, 1, 1, "sprites/png/gui/gui04.png"] // (?) to top
270270
}
271271
alternative_sprites (ottd_gui147, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP) {
272272
tmpl_gui2x_file_caption(418, 712, "sprites/png/gui/gui2x.png")
@@ -277,12 +277,12 @@ alternative_sprites (ottd_gui147, ZOOM_LEVEL_IN_2X, BIT_DEPTH_8BPP) {
277277
tmpl_gui2x_file_caption(571, 800, "sprites/png/gui/gui2x.png") // (?) to top
278278
}
279279
replacenew ottd_gui153(OTTD_GUI, "", 153) {
280-
[ 0, 0, 7, 8, 0, 0, "sprites/png/extra/extra-gui-bug.png"] // window decorations: debugging icon
280+
[ 0, 0, 7, 8, 1, 1, "sprites/png/extra/extra-gui-bug.png"] // window decorations: debugging icon
281281
[ 401, 201, 9, 9, 0, 0, "sprites/png/extra/extra-gui-profit.png"] // Profit not applicable
282282
[ 420, 201, 9, 9, 0, 0, "sprites/png/extra/extra-gui-profit.png"] // Profit negative
283283
[ 439, 201, 9, 9, 0, 0, "sprites/png/extra/extra-gui-profit.png"] // Profit some
284284
[ 458, 201, 9, 9, 0, 0, "sprites/png/extra/extra-gui-profit.png"] // Profit lots
285-
[ 401, 99, 8, 10, 0, 0, "sprites/png/extra/extra-gui-profit.png"] // Unread news
285+
[ 401, 99, 8, 10, 1, 0, "sprites/png/extra/extra-gui-profit.png"] // Unread news
286286
[ 6, 7, 13, 10, 0, 0, "sprites/png/extra/extra-gui-exclusive.png"] // Exclusive transport rights
287287
[ 22, 23, 12, 10, 0, 0, "sprites/png/extra/extra-gui-autoreplace.png"] // vehicle groups: Autoreplace protection
288288
[ 22, 2, 12, 10, 0, 0, "sprites/png/extra/extra-gui-autoreplace.png"] // vehicle groups: Autoreplace defined

‎sprites/templates/sprite_templates.pnml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,6 @@ template tmpl_gui2x_file_medium (x, y, file) { [x, y, 32, 32, 0, 0, NOCROP, file
282282
template tmpl_gui2x_file_caption(x, y, file) { [x, y, 20, 20, 0, 0, NOCROP, file] }
283283

284284
template tmpl_gui2x_toolbar(x, y) { [x, y, 40, 40, 0, 0, NOCROP] }
285-
template tmpl_gui2x_toolbar_wide(x, y) { [x, y, 80, 40, 0, 0, NOCROP] }
285+
template tmpl_gui2x_toolbar_wide(x, y, xoffs) { [x, y, 80, 40, xoffs, 0, NOCROP] }
286286
template tmpl_gui2x_medium (x, y) { [x, y, 32, 32, 0, 0, NOCROP] }
287287
template tmpl_gui2x_caption(x, y) { [x, y, 20, 20, 0, 0, NOCROP] }

0 commit comments

Comments
 (0)