diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-11 12:38:37 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-11 12:38:37 +0300 |
commit | 703d2b41fa299a9f8e24a5f6064c3624c3dedbbb (patch) | |
tree | 42667196b32cd8df1f7275e31cb4807214df681b | |
parent | 6015ee90776ef748fb83769d01735ff0f5ff42d3 (diff) |
Mobile: Minor tweaks
-rw-r--r-- | src/gmdocument.c | 5 | ||||
-rw-r--r-- | src/ui/documentwidget.c | 1 | ||||
-rw-r--r-- | src/ui/mobile.c | 2 | ||||
-rw-r--r-- | src/ui/root.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/gmdocument.c b/src/gmdocument.c index 56953255..4f4546f2 100644 --- a/src/gmdocument.c +++ b/src/gmdocument.c | |||
@@ -256,9 +256,10 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li | |||
256 | if ((len = decodeBytes_MultibyteChar(desc.start, desc.end, &icon)) > 0) { | 256 | if ((len = decodeBytes_MultibyteChar(desc.start, desc.end, &icon)) > 0) { |
257 | if (desc.start + len < desc.end && | 257 | if (desc.start + len < desc.end && |
258 | (isPictograph_Char(icon) || isEmoji_Char(icon) || | 258 | (isPictograph_Char(icon) || isEmoji_Char(icon) || |
259 | icon == 0x2139 /* info */ || | ||
259 | icon == 0x2191 /* up arrow */ || | 260 | icon == 0x2191 /* up arrow */ || |
260 | icon == 0x2a2f /* close X */ || | 261 | icon == 0x2022 /* bullet */ || |
261 | icon == 0x2022 /* bullet */) && | 262 | icon == 0x2a2f /* close X */) && |
262 | !isFitzpatrickType_Char(icon)) { | 263 | !isFitzpatrickType_Char(icon)) { |
263 | link->flags |= iconFromLabel_GmLinkFlag; | 264 | link->flags |= iconFromLabel_GmLinkFlag; |
264 | link->labelIcon = (iRangecc){ desc.start, desc.start + len }; | 265 | link->labelIcon = (iRangecc){ desc.start, desc.start + len }; |
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c index 20c0370a..936c3cb7 100644 --- a/src/ui/documentwidget.c +++ b/src/ui/documentwidget.c | |||
@@ -2374,6 +2374,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd) | |||
2374 | msg, "%s\n", formatCStrs_Lang("num.bytes.n", size_Block(&d->sourceContent))); | 2374 | msg, "%s\n", formatCStrs_Lang("num.bytes.n", size_Block(&d->sourceContent))); |
2375 | } | 2375 | } |
2376 | } | 2376 | } |
2377 | /* TODO: On mobile, omit the CA status. */ | ||
2377 | appendFormat_String( | 2378 | appendFormat_String( |
2378 | msg, | 2379 | msg, |
2379 | "\n%s${pageinfo.cert.status}\n" | 2380 | "\n%s${pageinfo.cert.status}\n" |
diff --git a/src/ui/mobile.c b/src/ui/mobile.c index 263fc141..580cc355 100644 --- a/src/ui/mobile.c +++ b/src/ui/mobile.c | |||
@@ -201,6 +201,8 @@ static iBool isTwoColumnPage_(iWidget *d) { | |||
201 | 201 | ||
202 | static iBool isOmittedPref_(const iString *id) { | 202 | static iBool isOmittedPref_(const iString *id) { |
203 | static const char *omittedPrefs[] = { | 203 | static const char *omittedPrefs[] = { |
204 | "prefs.userfont", | ||
205 | "prefs.animate", | ||
204 | "prefs.smoothscroll", | 206 | "prefs.smoothscroll", |
205 | "prefs.imageloadscroll", | 207 | "prefs.imageloadscroll", |
206 | "prefs.pinsplit", | 208 | "prefs.pinsplit", |
diff --git a/src/ui/root.c b/src/ui/root.c index 91e19e46..52b6829c 100644 --- a/src/ui/root.c +++ b/src/ui/root.c | |||
@@ -1126,7 +1126,7 @@ void createUserInterface_Root(iRoot *d) { | |||
1126 | setId_Widget(as_Widget(pageMenuButton), "pagemenubutton"); | 1126 | setId_Widget(as_Widget(pageMenuButton), "pagemenubutton"); |
1127 | setFont_LabelWidget(pageMenuButton, uiContentBold_FontId); | 1127 | setFont_LabelWidget(pageMenuButton, uiContentBold_FontId); |
1128 | setAlignVisually_LabelWidget(pageMenuButton, iTrue); | 1128 | setAlignVisually_LabelWidget(pageMenuButton, iTrue); |
1129 | addChildFlags_Widget(urlButtons, iClob(pageMenuButton), embedFlags); | 1129 | addChildFlags_Widget(urlButtons, iClob(pageMenuButton), embedFlags | tight_WidgetFlag); |
1130 | updateSize_LabelWidget(pageMenuButton); | 1130 | updateSize_LabelWidget(pageMenuButton); |
1131 | } | 1131 | } |
1132 | /* Reload button. */ { | 1132 | /* Reload button. */ { |