Skip to content

adapt to longer strings returned from getReadableName #1441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myk002 merged 1 commit into from
Apr 26, 2025
Merged

adapt to longer strings returned from getReadableName #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gui/family-affairs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ end
FamilyAffairs = defclass(FamilyAffairs, widgets.Window)
FamilyAffairs.ATTRS {
frame_title='Family manager',
frame={w=50, h=30, r=2, t=18},
frame={w=65, h=30, r=2, t=18},
frame_inset={t=1, l=1, r=1},
resizable=true,
initial_tab=DEFAULT_NIL,
Expand Down
4 changes: 2 additions & 2 deletions gui/manipulator.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,11 +709,11 @@ function Spreadsheet:init()
},
DataColumn{
view_id='name',
frame={w=30},
frame={w=45},
label='Name',
label_inset=8,
data_fn=dfhack.units.getReadableName,
data_width=30,
data_width=45,
shared=self.shared,
},
cols,
Expand Down
2 changes: 1 addition & 1 deletion gui/sitemap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ end
Sitemap = defclass(Sitemap, widgets.Window)
Sitemap.ATTRS {
frame_title='Sitemap',
frame={w=57, r=2, t=18, h=25},
frame={w=67, r=2, t=18, h=25},
resizable=true,
resize_min={w=44, h=20},
frame_inset={l=1, t=1, r=0, b=0},
Expand Down
16 changes: 3 additions & 13 deletions gui/unit-info-viewer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,6 @@ local function get_name_chunk(unit)
}
end

local function get_translated_name_chunk(unit)
local tname = dfhack.translation.translateName(dfhack.units.getVisibleName(unit), true)
if #tname == 0 then return '' end
return ('"%s"'):format(tname)
end

local function get_description_chunk(unit)
local desc = dfhack.units.getCasteRaw(unit).description
if #desc == 0 then return end
Expand Down Expand Up @@ -458,15 +452,12 @@ function UnitInfo:init()
self:addviews{
widgets.Label{
view_id='nameprof',
frame={t=0, l=0},
},
widgets.Label{
view_id='translated_name',
frame={t=1, l=0},
frame={t=0, l=0, h=1},
auto_height=false,
},
widgets.Label{
view_id='chunks',
frame={t=3, l=0, b=0, r=0},
frame={t=2, l=0, b=0, r=0},
auto_height=false,
text='Please select a unit.',
},
Expand All @@ -492,7 +483,6 @@ end
function UnitInfo:refresh(unit, width)
self.unit_id = unit.id
self.subviews.nameprof:setText{get_name_chunk(unit)}
self.subviews.translated_name:setText{get_translated_name_chunk(unit)}

local chunks = {}
add_chunk(chunks, get_description_chunk(unit), width)
Expand Down