summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-03-29 13:40:54 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-03-29 13:41:35 +0300
commitf9117532955f0d8935971eb1053f13f9ecab7662 (patch)
tree843914f355dc8da3cadaa6bd450075c7dc501054 /src/ui
parent6074a467110bfb4e40c3e659cc674d7bbaa82d5a (diff)
Preferences: Collapse preformatted blocks on page load
IssueID #180
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/documentwidget.c3
-rw-r--r--src/ui/listwidget.c4
-rw-r--r--src/ui/util.c3
3 files changed, 8 insertions, 2 deletions
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
2506 setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_HAND); 2506 setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_HAND);
2507 } 2507 }
2508 else { 2508 else {
2509 if (value_Anim(&d->altTextOpacity) < 0.667f) {
2510 setValue_Anim(&d->altTextOpacity, 0, 0); /* keep it hidden while moving */
2511 }
2509 updateHover_DocumentWidget_(d, mpos); 2512 updateHover_DocumentWidget_(d, mpos);
2510 } 2513 }
2511 } 2514 }
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) {
199 (int) size_PtrArray(&d->items)); 199 (int) size_PtrArray(&d->items));
200} 200}
201 201
202#if 0
202static iRanges visRange_ListWidget_(const iListWidget *d) { 203static iRanges visRange_ListWidget_(const iListWidget *d) {
203 if (d->itemHeight == 0) { 204 if (d->itemHeight == 0) {
204 return (iRanges){ 0, 0 }; 205 return (iRanges){ 0, 0 };
@@ -207,6 +208,7 @@ static iRanges visRange_ListWidget_(const iListWidget *d) {
207 vis.end = iMin(size_PtrArray(&d->items), vis.start + visCount_ListWidget(d) + 1); 208 vis.end = iMin(size_PtrArray(&d->items), vis.start + visCount_ListWidget(d) + 1);
208 return vis; 209 return vis;
209} 210}
211#endif
210 212
211size_t itemIndex_ListWidget(const iListWidget *d, iInt2 pos) { 213size_t itemIndex_ListWidget(const iListWidget *d, iInt2 pos) {
212 const iRect bounds = innerBounds_Widget(constAs_Widget(d)); 214 const iRect bounds = innerBounds_Widget(constAs_Widget(d));
@@ -339,11 +341,11 @@ static void drawItem_ListWidget_(const iListWidget *d, iPaint *p, size_t index,
339 const iRect itemRect = { pos, init_I2(width_Rect(bounds), d->itemHeight) }; 341 const iRect itemRect = { pos, init_I2(width_Rect(bounds), d->itemHeight) };
340 class_ListItem(item)->draw(item, p, itemRect, d); 342 class_ListItem(item)->draw(item, p, itemRect, d);
341} 343}
342#endif
343 344
344static const iListItem *item_ListWidget_(const iListWidget *d, size_t pos) { 345static const iListItem *item_ListWidget_(const iListWidget *d, size_t pos) {
345 return constAt_PtrArray(&d->items, pos); 346 return constAt_PtrArray(&d->items, pos);
346} 347}
348#endif
347 349
348static void draw_ListWidget_(const iListWidget *d) { 350static void draw_ListWidget_(const iListWidget *d) {
349 const iWidget *w = constAs_Widget(d); 351 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) {
1899 addChild_Widget(values, iClob(makeToggle_Widget("prefs.hoverlink"))); 1899 addChild_Widget(values, iClob(makeToggle_Widget("prefs.hoverlink")));
1900 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.centershort}"))); 1900 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.centershort}")));
1901 addChild_Widget(values, iClob(makeToggle_Widget("prefs.centershort"))); 1901 addChild_Widget(values, iClob(makeToggle_Widget("prefs.centershort")));
1902 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.collapsepreonload}")));
1903 addChild_Widget(values, iClob(makeToggle_Widget("prefs.collapsepreonload")));
1902 makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values); 1904 makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values);
1903 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.smoothscroll}"))); 1905 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.smoothscroll}")));
1904 addChild_Widget(values, iClob(makeToggle_Widget("prefs.smoothscroll"))); 1906 addChild_Widget(values, iClob(makeToggle_Widget("prefs.smoothscroll")));
@@ -2018,7 +2020,6 @@ iWidget *makePreferences_Widget(void) {
2018 appendTwoColumnPage_(tabs, "${heading.prefs.style}", '4', &headings, &values); 2020 appendTwoColumnPage_(tabs, "${heading.prefs.style}", '4', &headings, &values);
2019 makeTwoColumnHeading_("${heading.prefs.fonts}", headings, values); 2021 makeTwoColumnHeading_("${heading.prefs.fonts}", headings, values);
2020 /* Fonts. */ { 2022 /* Fonts. */ {
2021 iWidget *fonts;
2022 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.headingfont}"))); 2023 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.headingfont}")));
2023 addFontButtons_(values, "headingfont"); 2024 addFontButtons_(values, "headingfont");
2024 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font}"))); 2025 addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font}")));