MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swapped any instance of 'border' being after 'xyz', everywhere

develop
Taxi Service 2023-05-18 11:30:21 +02:00
parent eb742a603d
commit 90fe6e7ae3
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/dev/Lua API.rst
Unescape Escape View File

@ -4347,32 +4347,32 @@ A framed screen has the following attributes:
There are the following predefined frame style tables: There are the following predefined frame style tables:
* ``WINDOW_FRAME`` * ``FRAME_WINDOW``
A frame suitable for a draggable, optionally resizable window. A frame suitable for a draggable, optionally resizable window.
* ``PANEL_FRAME`` * ``FRAME_PANEL``
A frame suitable for a static (non-draggable, non-resizable) panel. A frame suitable for a static (non-draggable, non-resizable) panel.
* ``MEDIUM_FRAME`` * ``FRAME_MEDIUM``
A frame suitable for overlay widget panels. A frame suitable for overlay widget panels.
* ``BOLD_FRAME`` * ``FRAME_BOLD``
A frame suitable for a non-draggable panel meant to capture the user's focus, A frame suitable for a non-draggable panel meant to capture the user's focus,
like an important notification, confirmation dialog or error message. like an important notification, confirmation dialog or error message.
* ``INTERIOR_FRAME`` * ``FRAME_INTERIOR``
A frame suitable for light interior accent elements. This frame does *not* A frame suitable for light interior accent elements. This frame does *not*
have a visible ``DFHack`` signature on it, so it must not be used as the most have a visible ``DFHack`` signature on it, so it must not be used as the most
external frame for a DFHack-owned UI. external frame for a DFHack-owned UI.
* ``INTERIOR_MEDIUM_FRAME`` * ``FRAME_INTERIOR_MEDIUM``
A copy of ``MEDIUM_FRAME`` that lacks the ``DFHack`` signature. Suitable for A copy of ``FRAME_MEDIUM`` that lacks the ``DFHack`` signature. Suitable for
panels that are part of a larger widget cluster. Must *not* be used as the panels that are part of a larger widget cluster. Must *not* be used as the
most external frame for a DFHack-owned UI. most external frame for a DFHack-owned UI.
@ -4509,7 +4509,7 @@ Has attributes:
by 1. The attributes are identical to what is defined in the by 1. The attributes are identical to what is defined in the
`FramedScreen class`_. When using the predefined frame styles in the ``gui`` `FramedScreen class`_. When using the predefined frame styles in the ``gui``
module, remember to ``require`` the gui module and prefix the identifier with module, remember to ``require`` the gui module and prefix the identifier with
``gui.``, e.g. ``gui.GREY_LINE_FRAME``. ``gui.``, e.g. ``gui.FRAME_GREY_LINE``.
Has functions: Has functions:

10
library/LuaApi.cpp
Unescape Escape View File

@ -1716,11 +1716,11 @@ static const LuaWrapper::FunctionReg dfhack_textures_module[] = {
WRAPM(Textures, getIconsTexposStart), WRAPM(Textures, getIconsTexposStart),
WRAPM(Textures, getOnOffTexposStart), WRAPM(Textures, getOnOffTexposStart),
WRAPM(Textures, getControlPanelTexposStart), WRAPM(Textures, getControlPanelTexposStart),
WRAPM(Textures, getThinBordersTexposStart), WRAPM(Textures, getBorderThinTexposStart),
WRAPM(Textures, getMediumBordersTexposStart), WRAPM(Textures, getBorderMediumTexposStart),
WRAPM(Textures, getBoldBordersTexposStart), WRAPM(Textures, getBorderBoldTexposStart),
WRAPM(Textures, getPanelBordersTexposStart), WRAPM(Textures, getBorderPanelTexposStart),
WRAPM(Textures, getWindowBordersTexposStart), WRAPM(Textures, getBorderWindowTexposStart),
{ NULL, NULL } { NULL, NULL }
}; };

4
plugins/lua/buildingplan/pens.lua
Unescape Escape View File

@ -18,12 +18,12 @@ function reload_pens()
GOOD_TILE_PEN = to_pen{ch='o', fg=COLOR_GREEN, tile=dfhack.screen.findGraphicsTile('CURSORS', 1, 2)} GOOD_TILE_PEN = to_pen{ch='o', fg=COLOR_GREEN, tile=dfhack.screen.findGraphicsTile('CURSORS', 1, 2)}
BAD_TILE_PEN = to_pen{ch='X', fg=COLOR_RED, tile=dfhack.screen.findGraphicsTile('CURSORS', 3, 0)} BAD_TILE_PEN = to_pen{ch='X', fg=COLOR_RED, tile=dfhack.screen.findGraphicsTile('CURSORS', 3, 0)}
local tb_texpos = dfhack.textures.getThinBordersTexposStart() local tb_texpos = dfhack.textures.getBorderThinTexposStart()
VERT_TOP_PEN = to_pen{tile=tp(tb_texpos, 10), ch=194, fg=COLOR_GREY, bg=COLOR_BLACK} VERT_TOP_PEN = to_pen{tile=tp(tb_texpos, 10), ch=194, fg=COLOR_GREY, bg=COLOR_BLACK}
VERT_MID_PEN = to_pen{tile=tp(tb_texpos, 4), ch=179, fg=COLOR_GREY, bg=COLOR_BLACK} VERT_MID_PEN = to_pen{tile=tp(tb_texpos, 4), ch=179, fg=COLOR_GREY, bg=COLOR_BLACK}
VERT_BOT_PEN = to_pen{tile=tp(tb_texpos, 11), ch=193, fg=COLOR_GREY, bg=COLOR_BLACK} VERT_BOT_PEN = to_pen{tile=tp(tb_texpos, 11), ch=193, fg=COLOR_GREY, bg=COLOR_BLACK}
local mb_texpos = dfhack.textures.getMediumBordersTexposStart() local mb_texpos = dfhack.textures.getBorderMediumTexposStart()
HORI_LEFT_PEN = to_pen{tile=tp(mb_texpos, 12), ch=195, fg=COLOR_GREY, bg=COLOR_BLACK} HORI_LEFT_PEN = to_pen{tile=tp(mb_texpos, 12), ch=195, fg=COLOR_GREY, bg=COLOR_BLACK}
HORI_MID_PEN = to_pen{tile=tp(mb_texpos, 5), ch=196, fg=COLOR_GREY, bg=COLOR_BLACK} HORI_MID_PEN = to_pen{tile=tp(mb_texpos, 5), ch=196, fg=COLOR_GREY, bg=COLOR_BLACK}
HORI_RIGHT_PEN = to_pen{tile=tp(mb_texpos, 13), ch=180, fg=COLOR_GREY, bg=COLOR_BLACK} HORI_RIGHT_PEN = to_pen{tile=tp(mb_texpos, 13), ch=180, fg=COLOR_GREY, bg=COLOR_BLACK}