From 69e72e4541c66bd89696cf7486db41c1803f84bf Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Thu, 3 Apr 2025 13:18:35 -0500 Subject: [PATCH] Update the DFHack Logo stuff Make it one image file and clean up the references to it. --- data/art/logo.png | Bin 997 -> 1213 bytes data/art/logo_hovered.png | Bin 5124 -> 0 bytes docs/dev/Lua API.rst | 12 ++++++++---- plugins/lua/hotkeys.lua | 7 +++++-- 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 data/art/logo_hovered.png diff --git a/data/art/logo.png b/data/art/logo.png index 133dc5aaf8c98921bcc0203ebd986d4915c726cd..c34407b372cdb138314827e163ec38686cc42678 100644 GIT binary patch delta 1193 zcmV;a1Xlay2fYb@iBL{Q4GJ0x0000DNk~Le0000$0000a2m$~A0Jd(c#Q*>R0drDE zLIAGL9O(c61YJo)K~z|Uh#*Sn1`iPr0T%^HKnVT=HsV1L z-9!4ClijDBbIJs=B!bs;t|A5xfskZ#5sac@YpZ*ZF^v#^G2NFvZ0+G`r|859YHHYJ zzeA{c_3C@|x~jUq>bM9Yz!HDn_A%w}1AuSeerLokNxuQW?602~@mK%&yN{04ThPzt z`}eq*ES^Akc6iBu>Qa{Um3An3YI z2vJqFtFz00<*LmOu+cSv5AtIIt+$XM2=v~6uq+DzCMPGO(Wq_IG_6!BwQr2x-m4F-b%Aj@*cfimK6odfsx_ZBRc6D=e69D@A`)MCX^-cI7fA<7p zu^3%lU0sE?1&wmxefS{%r`MdYn$PFy$0N%!E>N6P8-s&`T?fjDzqJQWPEP0sMNx{y zBF)b8{MyN25{0FkV|2J?D2O&}cO1 zHJ8ul3xxszq|<2(e|~-r05dZ)=oX1YCMG7(+2`|Rv)R{%&WOL203H^}WD-w7P17vP z+TGm+09lsD#>N~yIgX1&BD6Rul}f>XU~pq&e*X4a49#4%s=5L;vaN>8Yuy_MtQ7cdAi5$u&&_0L!v)eyi2$&CLz+ z1_A*9C=?2oWjQ{CSeE5>yP@qm!j#{+2S!Fl?2K(ZK0abk0Py?$c(K^q+p`^iQ2jat zOh@#bzm>q<-5mftJUr0N7-?>9E*uWqJ}WCL0FX+huCK4@zIK3)(uEQK^Af65D#cl8@LN6$xX6F}FQ$J0(ergMw65}5 HlfMHdlqf{a delta 975 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 Z2o#j-Nb=lLw87Bo0{&|6lI80+{TEB3t%Cpn diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst index d449c8810b..071ab48ecb 100644 --- a/docs/dev/Lua API.rst +++ b/docs/dev/Lua API.rst @@ -5945,6 +5945,8 @@ common text token lists that you can then pass as ``text`` to a ``Label``: Example 2: The DFHack logo - a graphical button in graphics mode and a text button in ASCII mode. The ASCII colors use the default for hovering:: + local logo_textures=dfhack.textures.loadTileset( + 'hack/data/art/logo.png', 8, 12, true), widgets.Label{ text=widgets.makeButtonLabelText{ chars={ @@ -5952,10 +5954,12 @@ common text token lists that you can then pass as ``text`` to a ``Label``: {179, 'H', 'a', 179}, {179, 'c', 'k', 179}, }, - tileset=dfhack.textures.loadTileset( - 'hack/data/art/logo.png', 8, 12, true), - tileset_hover=dfhack.textures.loadTileset( - 'hack/data/art/logo_hovered.png', 8, 12, true), + tileset=logo_textures, + tileset_offset=1, + tileset_stride=8, + tileset_hover=logo_textures, + tileset_hover_offset=5, + tileset_hover_stride=8, }, on_click=function() dfhack.run_command{'hotkeys', 'menu', self.name} diff --git a/plugins/lua/hotkeys.lua b/plugins/lua/hotkeys.lua index 74d0b96231..d0cecb5ba0 100644 --- a/plugins/lua/hotkeys.lua +++ b/plugins/lua/hotkeys.lua @@ -6,7 +6,6 @@ local overlay = require('plugins.overlay') local widgets = require('gui.widgets') local logo_textures = dfhack.textures.loadTileset('hack/data/art/logo.png', 8, 12, true) -local logo_hovered_textures = dfhack.textures.loadTileset('hack/data/art/logo_hovered.png', 8, 12, true) local function get_command(cmdline) local first_word = cmdline:trim():split(' +')[1] @@ -41,7 +40,11 @@ function HotspotMenuWidget:init() {VERT_BAR, 'c', 'k', VERT_BAR}, }, tileset=logo_textures, - tileset_hover=logo_hovered_textures, + tileset_offset=1, + tileset_stride=8, + tileset_hover=logo_textures, + tileset_hover_offset=5, + tileset_hover_stride=8, }, on_click=function() dfhack.run_command{'hotkeys', 'menu', self.name} end, },