Cleanup patch to move macros in the string.
This commit is contained in:
parent
fec0ec9d71
commit
ddc3769581
4 changed files with 20 additions and 20 deletions
|
@ -51,9 +51,9 @@
|
|||
|
||||
#define _GUI_DRAW_CURSOR X_OFFSET
|
||||
[line]
|
||||
x1 = "(cursor_offset + " + {X_OFFSET} + ")"
|
||||
x1 = "(cursor_offset + {X_OFFSET})"
|
||||
y1 = "(text_y_offset)"
|
||||
x2 = "(cursor_offset + " + {X_OFFSET} + ")"
|
||||
x2 = "(cursor_offset + {X_OFFSET})"
|
||||
y2 = "(text_y_offset + text_font_height)"
|
||||
colour = "255, 255, 255, 255"
|
||||
thickness = 1
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
[text]
|
||||
x = {OFFSET}
|
||||
y = {GUI__TEXT_VERTICALLY_CENTRED}
|
||||
w = "(width - " + {OFFSET} + ")"
|
||||
w = "(width - {OFFSET})"
|
||||
h = "(text_height)"
|
||||
font_size = {FONT_SIZE}
|
||||
colour = {FONT_COLOUR}
|
||||
|
|
|
@ -21,7 +21,7 @@ full_redraw = "true"
|
|||
[image]
|
||||
x = 0
|
||||
y = {GROOVE_TOP}
|
||||
h = "(height - " + {GROOVE_TOP} + " - " + {GROOVE_BOTTOM} + ")"
|
||||
h = "(height - {GROOVE_TOP} - {GROOVE_BOTTOM})"
|
||||
stretch = true
|
||||
name = "buttons/scrollgroove-mid.png"
|
||||
[/image]
|
||||
|
@ -29,7 +29,7 @@ full_redraw = "true"
|
|||
[image]
|
||||
# 5 pixels high
|
||||
x = 0
|
||||
y = "(height - " + {GROOVE_BOTTOM} + ")"
|
||||
y = "(height - {GROOVE_BOTTOM})"
|
||||
name = "buttons/scrollgroove-bottom.png"
|
||||
[/image]
|
||||
|
||||
|
@ -41,22 +41,22 @@ full_redraw = "true"
|
|||
# 5 pixels high
|
||||
x = 0
|
||||
y = "(positioner_offset)"
|
||||
name = "buttons/scrolltop" + {IMAGE_SUFFIX}
|
||||
name = "buttons/scrolltop{IMAGE_SUFFIX}"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
x = 0
|
||||
y = "(positioner_offset + " + {POSITIONER_TOP} + ")"
|
||||
h = "(positioner_length - " + {POSITIONER_TOP} + " - " + {POSITIONER_BOTTOM} + ")"
|
||||
y = "(positioner_offset + {POSITIONER_TOP})"
|
||||
h = "(positioner_length - {POSITIONER_TOP} - {POSITIONER_BOTTOM})"
|
||||
stretch = true
|
||||
name = "buttons/scrollmid"+ {IMAGE_SUFFIX}
|
||||
name = "buttons/scrollmid{IMAGE_SUFFIX}"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
# 5 pixels high
|
||||
x = 0
|
||||
y = "(positioner_offset + positioner_length - " + {POSITIONER_BOTTOM} + ")"
|
||||
name = "buttons/scrollbottom" + {IMAGE_SUFFIX}
|
||||
y = "(positioner_offset + positioner_length - {POSITIONER_BOTTOM})"
|
||||
name = "buttons/scrollbottom{IMAGE_SUFFIX}"
|
||||
[/image]
|
||||
|
||||
[/draw]
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
# [/rectangle]
|
||||
|
||||
[image]
|
||||
name = "dialogs/" + {BASE_NAME} + "-border-topleft.png"
|
||||
name = "dialogs/{BASE_NAME}-border-topleft.png"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
|
@ -51,13 +51,13 @@
|
|||
y = 0
|
||||
w = "(width - 14)"
|
||||
stretch = "true"
|
||||
name = "dialogs/" + {BASE_NAME} + "-border-top.png"
|
||||
name = "dialogs/{BASE_NAME}-border-top.png"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
x = "(width - 9)"
|
||||
y = 0
|
||||
name = "dialogs/" + {BASE_NAME} + "-border-topright.png"
|
||||
name = "dialogs/{BASE_NAME}-border-topright.png"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
|
@ -65,13 +65,13 @@
|
|||
y = 5
|
||||
h = "(height - 14)"
|
||||
stretch = "true"
|
||||
name = "dialogs/" + {BASE_NAME} + "-border-right.png"
|
||||
name = "dialogs/{BASE_NAME}-border-right.png"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
x = "(width - 9)"
|
||||
y = "(height - 9)"
|
||||
name = "dialogs/" + {BASE_NAME} + "-border-botright.png"
|
||||
name = "dialogs/{BASE_NAME}-border-botright.png"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
|
@ -79,13 +79,13 @@
|
|||
y = "(height - 9)"
|
||||
w = "(width - 14)"
|
||||
stretch = "true"
|
||||
name = "dialogs/" + {BASE_NAME} + "-border-bottom.png"
|
||||
name = "dialogs/{BASE_NAME}-border-bottom.png"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
x = 0
|
||||
y = "(height - 9)"
|
||||
name = "dialogs/" + {BASE_NAME} + "-border-botleft.png"
|
||||
name = "dialogs/{BASE_NAME}-border-botleft.png"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
|
@ -93,7 +93,7 @@
|
|||
y = 5
|
||||
h = "(height - 14)"
|
||||
stretch = "true"
|
||||
name = "dialogs/" + {BASE_NAME} + "-border-left.png"
|
||||
name = "dialogs/{BASE_NAME}-border-left.png"
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
|
@ -101,7 +101,7 @@
|
|||
y = 5
|
||||
w = "(width - 14)"
|
||||
h = "(height - 14)"
|
||||
name = "dialogs/" + {BASE_NAME} + "-background.png"
|
||||
name = "dialogs/{BASE_NAME}-background.png"
|
||||
[/image]
|
||||
|
||||
[/draw]
|
||||
|
|
Loading…
Add table
Reference in a new issue