diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-12-21 23:24:13 +0100 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-12-21 23:24:13 +0100 |
| commit | 424a01ce5c2dd3cadd3d7ca60c7b43283c183b02 (patch) | |
| tree | fcf4e10c1ce3a56e3ae7aeb4e1798e21aafbea41 /dw/layout.cc | |
| parent | b21e3a4d98c1537ca430e81968dd4bb17561a981 (diff) | |
| parent | a614ea631d34d5c6273bfdaeea6a79ce2eb366a1 (diff) | |
Merge with main repo.
Diffstat (limited to 'dw/layout.cc')
| -rw-r--r-- | dw/layout.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dw/layout.cc b/dw/layout.cc index df22bb75..c87606dd 100644 --- a/dw/layout.cc +++ b/dw/layout.cc @@ -939,7 +939,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"); @@ -1042,7 +1042,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; |