diff options
Diffstat (limited to 'src/ui/inputwidget.c')
-rw-r--r-- | src/ui/inputwidget.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c index f1b21922..6e9ef6c2 100644 --- a/src/ui/inputwidget.c +++ b/src/ui/inputwidget.c | |||
@@ -1553,12 +1553,15 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) { | |||
1553 | lastLine_InputWidget_(d)->wrapLines.end - d->visWrapLines.end); | 1553 | lastLine_InputWidget_(d)->wrapLines.end - d->visWrapLines.end); |
1554 | if (!lineDelta) d->wheelAccum = 0; | 1554 | if (!lineDelta) d->wheelAccum = 0; |
1555 | } | 1555 | } |
1556 | d->wheelAccum -= lineDelta * lineHeight; | 1556 | if (lineDelta) { |
1557 | d->visWrapLines.start += lineDelta; | 1557 | d->wheelAccum -= lineDelta * lineHeight; |
1558 | d->visWrapLines.end += lineDelta; | 1558 | d->visWrapLines.start += lineDelta; |
1559 | d->inFlags |= needUpdateBuffer_InputWidgetFlag; | 1559 | d->visWrapLines.end += lineDelta; |
1560 | refresh_Widget(d); | 1560 | d->inFlags |= needUpdateBuffer_InputWidgetFlag; |
1561 | return iTrue; | 1561 | refresh_Widget(d); |
1562 | return iTrue; | ||
1563 | } | ||
1564 | return iFalse; | ||
1562 | } | 1565 | } |
1563 | switch (processEvent_Click(&d->click, ev)) { | 1566 | switch (processEvent_Click(&d->click, ev)) { |
1564 | case none_ClickResult: | 1567 | case none_ClickResult: |
@@ -1926,8 +1929,9 @@ static void draw_InputWidget_(const iInputWidget *d) { | |||
1926 | const iWidget *w = constAs_Widget(d); | 1929 | const iWidget *w = constAs_Widget(d); |
1927 | iRect bounds = adjusted_Rect(bounds_InputWidget_(d), padding_(), neg_I2(padding_())); | 1930 | iRect bounds = adjusted_Rect(bounds_InputWidget_(d), padding_(), neg_I2(padding_())); |
1928 | iBool isHint = isHintVisible_InputWidget_(d); | 1931 | iBool isHint = isHintVisible_InputWidget_(d); |
1929 | const iBool isFocused = isFocused_Widget(w); | 1932 | const iBool isFocused = isFocused_Widget(w); |
1930 | const iBool isHover = isHover_Widget(w) && | 1933 | const iBool isHover = deviceType_App() == desktop_AppDeviceType && |
1934 | isHover_Widget(w) && | ||
1931 | contains_InputWidget_(d, mouseCoord_Window(get_Window(), 0)); | 1935 | contains_InputWidget_(d, mouseCoord_Window(get_Window(), 0)); |
1932 | if (d->inFlags & needUpdateBuffer_InputWidgetFlag) { | 1936 | if (d->inFlags & needUpdateBuffer_InputWidgetFlag) { |
1933 | updateBuffered_InputWidget_(iConstCast(iInputWidget *, d)); | 1937 | updateBuffered_InputWidget_(iConstCast(iInputWidget *, d)); |