diff options
Diffstat (limited to 'dw')
| -rw-r--r-- | dw/findtext.cc | 2 | ||||
| -rw-r--r-- | dw/image.cc | 4 | ||||
| -rw-r--r-- | dw/layout.cc | 4 | ||||
| -rw-r--r-- | dw/table.cc | 2 | ||||
| -rw-r--r-- | dw/widget.cc | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/dw/findtext.cc b/dw/findtext.cc index e9384917..94b963ea 100644 --- a/dw/findtext.cc +++ b/dw/findtext.cc @@ -221,7 +221,7 @@ bool FindtextState::unhighlight () return false; } -bool FindtextState::search0 (bool backwards, bool firstTrial) +bool FindtextState::search0 (bool backwards, bool firstTrial) { if (iterator->getChar () == CharIterator::END) return false; diff --git a/dw/image.cc b/dw/image.cc index 20460f33..d6c2ea9d 100644 --- a/dw/image.cc +++ b/dw/image.cc @@ -213,10 +213,10 @@ void Image::sizeRequestImpl (core::Requisition *requisition) // dimensions limited to 2^15?) bool widthSpecified = getStyle()->width != core::style::LENGTH_AUTO || - getStyle()->minWidth != core::style::LENGTH_AUTO || + getStyle()->minWidth != core::style::LENGTH_AUTO || getStyle()->maxWidth != core::style::LENGTH_AUTO; bool heightSpecified = getStyle()->height != core::style::LENGTH_AUTO || - getStyle()->minHeight != core::style::LENGTH_AUTO || + getStyle()->minHeight != core::style::LENGTH_AUTO || getStyle()->maxHeight != core::style::LENGTH_AUTO; if (!widthSpecified && heightSpecified) diff --git a/dw/layout.cc b/dw/layout.cc index 2845a8e9..c2a53d08 100644 --- a/dw/layout.cc +++ b/dw/layout.cc @@ -926,7 +926,7 @@ void Layout::resizeIdle () int currVThickness = currVScrollbarThickness(); if (!canvasHeightGreater && - canvasAscent + canvasDescent > viewportHeight - currHThickness) { + canvasAscent + canvasDescent > viewportHeight - currHThickness) { canvasHeightGreater = true; DBG_OBJ_SET_SYM ("canvasHeightGreater", canvasHeightGreater ? "true" : "false"); @@ -1029,7 +1029,7 @@ bool Layout::buttonEvent (ButtonEventType type, View *view, int numPressed, * * Arguments are similar to dw::core::Layout::buttonPress. */ -bool Layout::motionNotify (View *view, int x, int y, ButtonState state) +bool Layout::motionNotify (View *view, int x, int y, ButtonState state) { EventButton event; diff --git a/dw/table.cc b/dw/table.cc index 661b8a11..30ee99c7 100644 --- a/dw/table.cc +++ b/dw/table.cc @@ -737,7 +737,7 @@ void Table::forceCalcCellSizes (bool calcHeights) // width for correction. int corrWidth = Table::getAdjustTableMinWidth () ? extremes.minWidthIntrinsic : 0; - int totalWidth = misc::max (availWidth, corrWidth) + int totalWidth = misc::max (availWidth, corrWidth) - ((numCols + 1) * getStyle()->hBorderSpacing + boxDiffWidth ()); DBG_OBJ_MSGF ("resize", 1, diff --git a/dw/widget.cc b/dw/widget.cc index 18748c4f..ed2c2b8e 100644 --- a/dw/widget.cc +++ b/dw/widget.cc @@ -1414,7 +1414,7 @@ void Widget::getPaddingArea (int *xPad, int *yPad, int *widthPad, *yPad = allocation.y + style->margin.top + style->borderWidth.top; *widthPad = allocation.width - style->margin.left - style->borderWidth.left - style->margin.right - style->borderWidth.right; - *heightPad = getHeight () - style->margin.top - style->borderWidth.top + *heightPad = getHeight () - style->margin.top - style->borderWidth.top - style->margin.bottom - style->borderWidth.bottom; } |