Skip to content

Commit

Permalink
Cleanup|libappfw: Label minimum height
Browse files Browse the repository at this point in the history
This is actually a minimum for the widget's total height, not just
content height.
  • Loading branch information
skyjake committed Oct 15, 2016
1 parent 5e72952 commit 227ad2c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
Expand Up @@ -160,8 +160,8 @@ DENG_GUI_PIMPL(GamePanelButtonWidget)
.setMidAnchorY(self.label().rule().midY());
packagesCounter->hide();
self.label().add(packagesCounter);
self.label().setMinimumContentHeight(style().fonts().font("default").lineSpacing() * 3 +
self.label().margins().height());
self.label().setMinimumHeight(style().fonts().font("default").lineSpacing() * 3 +
self.label().margins().height());

self.panel().setContent(saves);
self.panel().open();
Expand Down
2 changes: 1 addition & 1 deletion doomsday/sdk/libappfw/include/de/widgets/labelwidget.h
Expand Up @@ -175,7 +175,7 @@ class LIBAPPFW_PUBLIC LabelWidget : public GuiWidget, public IAssetGroup

void setMaximumTextWidth(Rule const &pixels);

void setMinimumContentHeight(Rule const &minHeight);
void setMinimumHeight(Rule const &minHeight);

/**
* Sets an alternative style for text. By default, the rich text styling comes
Expand Down
2 changes: 1 addition & 1 deletion doomsday/sdk/libappfw/src/widgets/labelwidget.cpp
Expand Up @@ -739,7 +739,7 @@ void LabelWidget::setMaximumTextWidth(Rule const &pixels)
requestGeometry();
}

void LabelWidget::setMinimumContentHeight(Rule const &minHeight)
void LabelWidget::setMinimumHeight(Rule const &minHeight)
{
d->minHeight->setSource(minHeight);
}
Expand Down

0 comments on commit 227ad2c

Please sign in to comment.