Skip to content
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

Character Panel Number spacing #7706

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −13
Open

Character Panel Number spacing #7706

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
14 changes: 9 additions & 5 deletions Source/engine/render/text_render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,11 +704,15 @@ uint32_t DrawString(const Surface &out, std::string_view text, const Rectangle &
const text_color color = GetColorFromFlags(opts.flags);

int charactersInLine = 0;
int lineWidth = 0;
if (HasAnyOf(opts.flags, (UiFlags::AlignCenter | UiFlags::AlignRight | UiFlags::KerningFitSpacing)))
lineWidth = GetLineWidth(text, size, opts.spacing, &charactersInLine);
int unadjustedWidth = GetLineWidth(text, size, opts.spacing, &charactersInLine);
int adjustedSpacing = HasAnyOf(opts.flags, UiFlags::KerningFitSpacing)
? AdjustSpacingToFitHorizontally(unadjustedWidth, opts.spacing, charactersInLine, rect.size.width)
: opts.spacing;
int adjustedLineWidth = GetLineWidth(text, size, adjustedSpacing, &charactersInLine);
Point characterPosition { GetLineStartX(opts.flags, rect, adjustedLineWidth), rect.position.y };

opts.spacing = adjustedSpacing;

Point characterPosition { GetLineStartX(opts.flags, rect, lineWidth), rect.position.y };
const int initialX = characterPosition.x;

const int rightMargin = rect.position.x + rect.size.width;
Expand All @@ -734,7 +738,7 @@ uint32_t DrawString(const Surface &out, std::string_view text, const Rectangle &
}

const uint32_t bytesDrawn = DoDrawString(clippedOut, text, rect, characterPosition,
lineWidth, charactersInLine, rightMargin, bottomMargin, size, color, outlined, opts);
unadjustedWidth, charactersInLine, rightMargin, bottomMargin, size, color, outlined, opts);

if (HasAnyOf(opts.flags, UiFlags::PentaCursor)) {
const ClxSprite sprite = (*pSPentSpn2Cels)[PentSpn2Spin()];
Expand Down
14 changes: 6 additions & 8 deletions Source/panels/charpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,15 @@ PanelEntry panelEntries[] = {
[]() { return StyledText { UiFlags::ColorWhite, StrCat(InspectPlayer->getCharacterLevel()) }; } },
{ N_("Experience"), { TopRightLabelX, 52 }, 99, 91,
[]() {
int spacing = ((InspectPlayer->_pExperience >= 1000000000) ? 0 : 1);
return StyledText { UiFlags::ColorWhite, FormatInteger(InspectPlayer->_pExperience), spacing };
return StyledText { UiFlags::ColorWhite, FormatInteger(InspectPlayer->_pExperience) };
} },
{ N_("Next level"), { TopRightLabelX, 80 }, 99, 198,
[]() {
if (InspectPlayer->isMaxCharacterLevel()) {
return StyledText { UiFlags::ColorWhitegold, std::string(_("None")) };
}
uint32_t nextExperienceThreshold = InspectPlayer->getNextExperienceThreshold();
int spacing = ((nextExperienceThreshold >= 1000000000) ? 0 : 1);
return StyledText { UiFlags::ColorWhite, FormatInteger(nextExperienceThreshold), spacing };
return StyledText { UiFlags::ColorWhite, FormatInteger(nextExperienceThreshold) };
} },

{ N_("Base"), { LeftColumnLabelX, /* set dynamically */ 0 }, 0, 44, {} },
Expand Down Expand Up @@ -180,8 +178,7 @@ PanelEntry panelEntries[] = {
{ N_("Damage"), { RightColumnLabelX, 219 }, 57, RightColumnLabelWidth,
[]() {
const auto [dmgMin, dmgMax] = GetDamage();
int spacing = ((dmgMin >= 100) ? -1 : 1);
return StyledText { GetValueColor(InspectPlayer->_pIBonusDam), StrCat(dmgMin, "-", dmgMax), spacing };
return StyledText { GetValueColor(InspectPlayer->_pIBonusDam), StrCat(dmgMin, "-", dmgMax) };
} },

{ N_("Life"), { LeftColumnLabelX, 284 }, 45, LeftColumnLabelWidth,
Expand All @@ -206,6 +203,7 @@ OptionalOwnedClxSpriteList Panel;
constexpr int PanelFieldHeight = 24;
constexpr int PanelFieldPaddingTop = 3;
constexpr int PanelFieldPaddingBottom = 3;
constexpr int PanelFieldPaddingSide = 5;
constexpr int PanelFieldInnerHeight = PanelFieldHeight - PanelFieldPaddingTop - PanelFieldPaddingBottom;

void DrawPanelField(const Surface &out, Point pos, int len, ClxSprite left, ClxSprite middle, ClxSprite right)
Expand Down Expand Up @@ -318,8 +316,8 @@ void DrawChr(const Surface &out)
DrawString(
out,
tmp.text,
{ entry.position + Displacement { pos.x, pos.y + PanelFieldPaddingTop }, { entry.length, PanelFieldInnerHeight } },
{ .flags = UiFlags::AlignCenter | UiFlags::VerticalCenter | tmp.style, .spacing = tmp.spacing });
{ entry.position + Displacement { pos.x + PanelFieldPaddingSide, pos.y + PanelFieldPaddingTop }, { entry.length - (PanelFieldPaddingSide * 2), PanelFieldInnerHeight } },
{ .flags = UiFlags::KerningFitSpacing | UiFlags::AlignCenter | UiFlags::VerticalCenter | tmp.style });
}
}
DrawStatButtons(out);
Expand Down
Loading