diff --git a/common.inc b/common.inc index 22e692a..f3bbf6b 100644 --- a/common.inc +++ b/common.inc @@ -1389,6 +1389,7 @@ dup .undef eq { pop "back.jpg" findfile } if /lightblue 0x7da3d1 def %% include theme_colors.inc +%% include theme_positions.inc /font.normal "16x16.fnt" findfile def /font.large font.normal def diff --git a/theme_colors.inc b/theme_colors.inc index 1090fbd..768b72a 100644 --- a/theme_colors.inc +++ b/theme_colors.inc @@ -1 +1,2 @@ /title.bg 0x3f81f1 newcolor +/timer.color lightgray newcolor diff --git a/theme_positions.inc b/theme_positions.inc new file mode 100644 index 0000000..777b5fa --- /dev/null +++ b/theme_positions.inc @@ -0,0 +1,2 @@ +/timer.position.x 620 def +/timer.position.y { panel.text.y } def diff --git a/timeout.inc b/timeout.inc index b7c9054..3eeebab 100644 --- a/timeout.inc +++ b/timeout.inc @@ -14,10 +14,10 @@ /timeout.current timeout.seconds def timeout.hidden { return } if - white setcolor + timer.color setcolor - timeout.time.x timeout.time.y moveto -30 0 rmoveto - currentpoint 30 fontheight image + timeout.time.x timeout.time.y moveto -40 0 rmoveto + currentpoint 40 fontheight image timeout.time 0 gt { timeout.seconds "%d s" timeout.buf sprintf @@ -36,8 +36,8 @@ /timeout.current -1 def /timeout.buf 64 string def - /timeout.time.x timeout.x def - /timeout.time.y timeout.y 120 add def + /timeout.time.x timer.position.x def + /timeout.time.y timer.position.y def } def