Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions include/sst/jucegui/data/Continuous.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ struct Continuous : public Labeled, WithDataListener<Continuous>
{
return getValueAsStringWithoutUnitsFor(getValue());
}
virtual std::optional<std::string> getValueAlternateAsStringFor(float const) const
{
return std::nullopt;
}
virtual std::optional<std::string> getValueAlternateAsString() const
{
return getValueAlternateAsStringFor(getValue());
}

virtual void setValueAsString(const std::string &s)
{
Expand Down
17 changes: 10 additions & 7 deletions src/sst/jucegui/components/ToolTip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,18 @@ int ToolTip::getRowWidth(int ri)
auto res = 0.f;
if (row.rowLeadingGlyph.has_value())
res += glyphSize;
res += std::min(blankStringWidth, row.leftIsMonospace
res += std::max(blankStringWidth, row.leftIsMonospace
? SST_STRING_WIDTH_FLOAT(df, row.leftAlignText)
: SST_STRING_WIDTH_FLOAT(f, row.leftAlignText));
res += std::min(blankStringWidth, row.centerIsMonospace
? SST_STRING_WIDTH_FLOAT(df, row.centerAlignText)
: SST_STRING_WIDTH_FLOAT(f, row.centerAlignText));
res += std::min(blankStringWidth, row.rightIsMonospace
? SST_STRING_WIDTH_FLOAT(df, row.rightAlignText)
: SST_STRING_WIDTH_FLOAT(f, row.rightAlignText));
if (!row.centerAlignText.empty())
res += 4 + std::max(blankStringWidth, row.centerIsMonospace
? SST_STRING_WIDTH_FLOAT(df, row.centerAlignText)
: SST_STRING_WIDTH_FLOAT(f, row.centerAlignText));

if (!row.rightAlignText.empty())
res += 4 + std::max(blankStringWidth, row.rightIsMonospace
? SST_STRING_WIDTH_FLOAT(df, row.rightAlignText)
: SST_STRING_WIDTH_FLOAT(f, row.rightAlignText));

return res + 4;
}
Expand Down