aboutsummaryrefslogtreecommitdiff
path: root/dw/widget.cc
diff options
context:
space:
mode:
Diffstat (limited to 'dw/widget.cc')
-rw-r--r--dw/widget.cc20
1 files changed, 5 insertions, 15 deletions
diff --git a/dw/widget.cc b/dw/widget.cc
index cb283aca..e7562875 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -342,13 +342,15 @@ int Widget::getAvailWidth ()
if (container == NULL) {
// TODO Consider nested layouts (e. g. <button>).
+ int viewportWidth =
+ layout->viewportWidth - (layout->canvasHeightGreater ?
+ layout->vScrollbarThickness : 0);
if (style::isAbsLength (getStyle()->width))
return style::absLengthVal (getStyle()->width);
else if (style::isPerLength (getStyle()->width))
- return style::multiplyWithPerLength (layout->viewportWidth,
- getStyle()->width);
+ return style::multiplyWithPerLength (viewportWidth, getStyle()->width);
else
- return layout->viewportWidth;
+ return viewportWidth;
} else
return container->getAvailWidthOfChild (this);
}
@@ -856,18 +858,6 @@ void Widget::notifySetParent()
{
}
-void Widget::setWidth (int width)
-{
-}
-
-void Widget::setAscent (int ascent)
-{
-}
-
-void Widget::setDescent (int descent)
-{
-}
-
bool Widget::isBlockLevel ()
{
// Most widgets are not block-level.