From f9117532955f0d8935971eb1053f13f9ecab7662 Mon Sep 17 00:00:00 2001 From: Jaakko Keränen Date: Mon, 29 Mar 2021 13:40:54 +0300 Subject: Preferences: Collapse preformatted blocks on page load IssueID #180 --- src/ui/documentwidget.c | 3 +++ src/ui/listwidget.c | 4 +++- src/ui/util.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/ui') diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c index 5d85e275..3b5ddb7c 100644 --- a/src/ui/documentwidget.c +++ b/src/ui/documentwidget.c @@ -2506,6 +2506,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_HAND); } else { + if (value_Anim(&d->altTextOpacity) < 0.667f) { + setValue_Anim(&d->altTextOpacity, 0, 0); /* keep it hidden while moving */ + } updateHover_DocumentWidget_(d, mpos); } } diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c index ac64091f..942c46dd 100644 --- a/src/ui/listwidget.c +++ b/src/ui/listwidget.c @@ -199,6 +199,7 @@ int visCount_ListWidget(const iListWidget *d) { (int) size_PtrArray(&d->items)); } +#if 0 static iRanges visRange_ListWidget_(const iListWidget *d) { if (d->itemHeight == 0) { return (iRanges){ 0, 0 }; @@ -207,6 +208,7 @@ static iRanges visRange_ListWidget_(const iListWidget *d) { vis.end = iMin(size_PtrArray(&d->items), vis.start + visCount_ListWidget(d) + 1); return vis; } +#endif size_t itemIndex_ListWidget(const iListWidget *d, iInt2 pos) { const iRect bounds = innerBounds_Widget(constAs_Widget(d)); @@ -339,11 +341,11 @@ static void drawItem_ListWidget_(const iListWidget *d, iPaint *p, size_t index, const iRect itemRect = { pos, init_I2(width_Rect(bounds), d->itemHeight) }; class_ListItem(item)->draw(item, p, itemRect, d); } -#endif static const iListItem *item_ListWidget_(const iListWidget *d, size_t pos) { return constAt_PtrArray(&d->items, pos); } +#endif static void draw_ListWidget_(const iListWidget *d) { const iWidget *w = constAs_Widget(d); diff --git a/src/ui/util.c b/src/ui/util.c index 64b32bad..870d1cad 100644 --- a/src/ui/util.c +++ b/src/ui/util.c @@ -1899,6 +1899,8 @@ iWidget *makePreferences_Widget(void) { addChild_Widget(values, iClob(makeToggle_Widget("prefs.hoverlink"))); addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.centershort}"))); addChild_Widget(values, iClob(makeToggle_Widget("prefs.centershort"))); + addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.collapsepreonload}"))); + addChild_Widget(values, iClob(makeToggle_Widget("prefs.collapsepreonload"))); makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values); addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.smoothscroll}"))); addChild_Widget(values, iClob(makeToggle_Widget("prefs.smoothscroll"))); @@ -2018,7 +2020,6 @@ iWidget *makePreferences_Widget(void) { appendTwoColumnPage_(tabs, "${heading.prefs.style}", '4', &headings, &values); makeTwoColumnHeading_("${heading.prefs.fonts}", headings, values); /* Fonts. */ { - iWidget *fonts; addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.headingfont}"))); addFontButtons_(values, "headingfont"); addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font}"))); -- cgit v1.2.3