invaders: add support for widget layouts
Signed-off-by: Gregor Best <farhaven@googlemail.com> Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
parent
ea618d3688
commit
50ee299aef
|
@ -375,16 +375,9 @@ function game.quit()
|
||||||
end
|
end
|
||||||
|
|
||||||
function game.highscore_show ()
|
function game.highscore_show ()
|
||||||
gamedata.highscore.window:geometry({ height = 140,
|
|
||||||
width = 200,
|
|
||||||
x = gamedata.field.x + math.floor(gamedata.field.w / 2) - 100,
|
|
||||||
y = gamedata.field.y + math.floor(gamedata.field.h / 2) - 55 })
|
|
||||||
gamedata.highscore.window.screen = gamedata.screen
|
|
||||||
|
|
||||||
gamedata.highscore.table = widget({ type = "textbox" })
|
gamedata.highscore.table = widget({ type = "textbox" })
|
||||||
gamedata.highscore.window.widgets = gamedata.highscore.table
|
|
||||||
|
|
||||||
gamedata.highscore.table.text = " Highscores:\n"
|
gamedata.highscore.table.text = "\tHighscores:\t\n"
|
||||||
|
|
||||||
for i = 1, 5 do
|
for i = 1, 5 do
|
||||||
gamedata.highscore.table.text = gamedata.highscore.table.text .. "\n\t" .. gamedata.highscore[i]
|
gamedata.highscore.table.text = gamedata.highscore.table.text .. "\n\t" .. gamedata.highscore[i]
|
||||||
|
@ -392,6 +385,13 @@ function game.highscore_show ()
|
||||||
|
|
||||||
gamedata.highscore.table.text = gamedata.highscore.table.text .. "\n\n Press Q to quit"
|
gamedata.highscore.table.text = gamedata.highscore.table.text .. "\n\n Press Q to quit"
|
||||||
|
|
||||||
|
gamedata.highscore.window:geometry(gamedata.highscore.table:extents())
|
||||||
|
gamedata.highscore.window:geometry({ x = gamedata.field.x + math.floor(gamedata.field.w / 2) - 100,
|
||||||
|
y = gamedata.field.y + math.floor(gamedata.field.h / 2) - 55 })
|
||||||
|
gamedata.highscore.window.screen = gamedata.screen
|
||||||
|
|
||||||
|
gamedata.highscore.window.widgets = gamedata.highscore.table
|
||||||
|
|
||||||
local fh = io.open(gamedata.cachedir.."/highscore_invaders", "w")
|
local fh = io.open(gamedata.cachedir.."/highscore_invaders", "w")
|
||||||
|
|
||||||
if not fh then
|
if not fh then
|
||||||
|
@ -494,23 +494,31 @@ function run(args)
|
||||||
gamedata.field.background.screen = gamedata.screen
|
gamedata.field.background.screen = gamedata.screen
|
||||||
end
|
end
|
||||||
|
|
||||||
|
gamedata.field.status = widget({ type = "textbox" })
|
||||||
|
gamedata.field.status.text = gamedata.score.." | "..gamedata.round .. " "
|
||||||
|
|
||||||
|
gamedata.field.caption = widget({ type = "textbox" })
|
||||||
|
gamedata.field.caption.text = " Awesome Invaders"
|
||||||
|
|
||||||
gamedata.field.north = wibox({ bg = gamedata.btheme.bg_focus or "#333333",
|
gamedata.field.north = wibox({ bg = gamedata.btheme.bg_focus or "#333333",
|
||||||
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
||||||
gamedata.field.north:geometry({ width = gamedata.field.w + 10,
|
gamedata.field.north:geometry({ width = gamedata.field.w + 10,
|
||||||
height = 15,
|
height = gamedata.field.caption:extents()["height"],
|
||||||
x = gamedata.field.x - 5,
|
x = gamedata.field.x - 5,
|
||||||
y = gamedata.field.y - 15 })
|
y = gamedata.field.y - gamedata.field.caption:extents()["height"] })
|
||||||
gamedata.field.north.screen = gamedata.screen
|
gamedata.field.north.screen = gamedata.screen
|
||||||
|
|
||||||
gamedata.field.status = widget({ type = "textbox",
|
gamedata.field.north.widgets = {
|
||||||
align = "right" })
|
{
|
||||||
gamedata.field.status.text = gamedata.score.." | "..gamedata.round .. " "
|
gamedata.field.caption,
|
||||||
|
["layout"] = awful.widget.layout.horizontal.leftright
|
||||||
gamedata.field.caption = widget({ type = "textbox",
|
},
|
||||||
align = "left" })
|
{
|
||||||
gamedata.field.caption.text = " Awesome Invaders"
|
gamedata.field.status,
|
||||||
|
["layout"] = awful.widget.layout.horizontal.rightleft
|
||||||
gamedata.field.north.widgets = { gamedata.field.caption, gamedata.field.status }
|
},
|
||||||
|
["layout"] = awful.widget.layout.horizontal.rightleft
|
||||||
|
}
|
||||||
|
|
||||||
gamedata.field.south = wibox({ bg = gamedata.btheme.bg_focus or "#333333",
|
gamedata.field.south = wibox({ bg = gamedata.btheme.bg_focus or "#333333",
|
||||||
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
fg = gamedata.btheme.fg_focus or "#FFFFFF" })
|
||||||
|
|
Loading…
Reference in New Issue