summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-05-12 11:46:05 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-05-12 11:46:05 +0300
commit8e2126cae79e8182562d1796b61fefc8ba74f4b8 (patch)
tree4e4bf80f9789b605ab9864bca33ed9fb5fac5985
parent4e84a9ff371e69ba828f8678c5cec89eea45d2ab (diff)
Cleanup
Use the Return key symbol consistently, also in the Search Query indicator. The input dialog "Send" label now no longer needs the "⇒" icon.
-rw-r--r--src/ui/documentwidget.c2
-rw-r--r--src/ui/inputwidget.c6
-rw-r--r--src/ui/root.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index f90733f5..4706033a 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1576,7 +1576,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
1576 isEmpty_String(&resp->meta) 1576 isEmpty_String(&resp->meta)
1577 ? format_CStr(cstr_Lang("dlg.input.prompt"), cstr_Rangecc(parts.path)) 1577 ? format_CStr(cstr_Lang("dlg.input.prompt"), cstr_Rangecc(parts.path))
1578 : cstr_String(&resp->meta), 1578 : cstr_String(&resp->meta),
1579 uiTextCaution_ColorEscape "\u21d2 ${dlg.input.send}", 1579 uiTextCaution_ColorEscape "${dlg.input.send}",
1580 format_CStr("!document.input.submit doc:%p", d)); 1580 format_CStr("!document.input.submit doc:%p", d));
1581 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"), 1581 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"),
1582 statusCode == sensitiveInput_GmStatusCode); 1582 statusCode == sensitiveInput_GmStatusCode);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 0fd80ca5..72f9f706 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -311,7 +311,7 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
311 d->cursor = 0; 311 d->cursor = 0;
312 d->lastCursor = 0; 312 d->lastCursor = 0;
313 d->cursorLine = 0; 313 d->cursorLine = 0;
314 d->verticalMoveX = -1; 314 d->verticalMoveX = -1; /* TODO: Use this. */
315 d->inFlags = eatEscape_InputWidgetFlag; 315 d->inFlags = eatEscape_InputWidgetFlag;
316 iZap(d->mark); 316 iZap(d->mark);
317 setMaxLen_InputWidget(d, maxLen); 317 setMaxLen_InputWidget(d, maxLen);
@@ -442,7 +442,6 @@ void setContentPadding_InputWidget(iInputWidget *d, int left, int right) {
442} 442}
443 443
444static void updateBuffered_InputWidget_(iInputWidget *d) { 444static void updateBuffered_InputWidget_(iInputWidget *d) {
445// iWindow *win = get_Window();
446 invalidateBuffered_InputWidget_(d); 445 invalidateBuffered_InputWidget_(d);
447 iString *bufText = NULL; 446 iString *bufText = NULL;
448#if 0 447#if 0
@@ -1194,7 +1193,8 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
1194 refresh_Widget(d); 1193 refresh_Widget(d);
1195 return iTrue; 1194 return iTrue;
1196 } 1195 }
1197 break; 1196 /* For moving to lookup from url entry. */
1197 return processEvent_Widget(as_Widget(d), ev);
1198 case SDLK_DOWN: 1198 case SDLK_DOWN:
1199 if (moveCursorByLine_InputWidget_(d, +1)) { 1199 if (moveCursorByLine_InputWidget_(d, +1)) {
1200 refresh_Widget(d); 1200 refresh_Widget(d);
diff --git a/src/ui/root.c b/src/ui/root.c
index 6f91b370..76ef05c4 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1038,7 +1038,7 @@ void createUserInterface_Root(iRoot *d) {
1038 moveToParentRightEdge_WidgetFlag); 1038 moveToParentRightEdge_WidgetFlag);
1039 /* Feeds refresh indicator is inside the input field. */ { 1039 /* Feeds refresh indicator is inside the input field. */ {
1040 iLabelWidget *queryInd = 1040 iLabelWidget *queryInd =
1041 new_LabelWidget(uiTextAction_ColorEscape "\u21d2 ${status.query}", NULL); 1041 new_LabelWidget(uiTextAction_ColorEscape "${status.query} \u21a9", NULL);
1042 setId_Widget(as_Widget(queryInd), "input.indicator.search"); 1042 setId_Widget(as_Widget(queryInd), "input.indicator.search");
1043 setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId); 1043 setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId);
1044 setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId); 1044 setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId);