summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-12-17 13:45:28 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-12-17 13:45:28 +0200
commit75291b4f8ff38dcc3fb2602783e8b7ef80a04fb0 (patch)
treef3f8c45b1d7ff5f6e69469885a663e74c4c441f7
parent27e60fdf26c031db7a967742f1870c3bdcf3f769 (diff)
Mobile: Input prompt actions menu
-rw-r--r--src/ui/documentwidget.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 78c95f40..1449d10d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2238,7 +2238,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
2238 addChildPos_Widget(buttons, iClob(counter), front_WidgetAddPos); 2238 addChildPos_Widget(buttons, iClob(counter), front_WidgetAddPos);
2239 } 2239 }
2240 else { 2240 else {
2241 insertChildAfter_Widget(buttons, iClob(counter), 0); 2241 insertChildAfter_Widget(buttons, iClob(counter), 1);
2242 } 2242 }
2243 if (lineBreak && deviceType_App() != desktop_AppDeviceType) { 2243 if (lineBreak && deviceType_App() != desktop_AppDeviceType) {
2244 addChildPos_Widget(buttons, iClob(lineBreak), front_WidgetAddPos); 2244 addChildPos_Widget(buttons, iClob(lineBreak), front_WidgetAddPos);
@@ -2251,7 +2251,15 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
2251 buttons, 2251 buttons,
2252 cstr_String(&d->linePrecedingLink)) } }; 2252 cstr_String(&d->linePrecedingLink)) } };
2253 iLabelWidget *menu = makeMenuButton_LabelWidget(midEllipsis_Icon, items, 1); 2253 iLabelWidget *menu = makeMenuButton_LabelWidget(midEllipsis_Icon, items, 1);
2254 addChildPos_Widget(buttons, iClob(menu), front_WidgetAddPos); 2254 if (deviceType_App() == desktop_AppDeviceType) {
2255 addChildPos_Widget(buttons, iClob(menu), front_WidgetAddPos);
2256 }
2257 else {
2258 insertChildAfterFlags_Widget(buttons, iClob(menu), 0,
2259 frameless_WidgetFlag | noBackground_WidgetFlag);
2260 setFont_LabelWidget(menu, font_LabelWidget((iLabelWidget *) lastChild_Widget(buttons)));
2261 setTextColor_LabelWidget(menu, uiTextAction_ColorId);
2262 }
2255 } 2263 }
2256 setValidator_InputWidget(findChild_Widget(dlg, "input"), inputQueryValidator_, d); 2264 setValidator_InputWidget(findChild_Widget(dlg, "input"), inputQueryValidator_, d);
2257 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"), 2265 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"),
@@ -3894,7 +3902,7 @@ static void finishWheelSwipe_DocumentWidget_(iDocumentWidget *d) {
3894 if (d->flags & eitherWheelSwipe_DocumentWidgetFlag && 3902 if (d->flags & eitherWheelSwipe_DocumentWidgetFlag &&
3895 d->wheelSwipeState == direct_WheelSwipeState) { 3903 d->wheelSwipeState == direct_WheelSwipeState) {
3896 const int side = wheelSwipeSide_DocumentWidget_(d); 3904 const int side = wheelSwipeSide_DocumentWidget_(d);
3897 int abort = (side == 1 && d->swipeSpeed < 0 || side == 2 && d->swipeSpeed > 0); 3905 int abort = ((side == 1 && d->swipeSpeed < 0) || (side == 2 && d->swipeSpeed > 0));
3898 if (iAbs(d->wheelSwipeDistance) < width_Widget(d) / 4 && iAbs(d->swipeSpeed) < 4 * gap_UI) { 3906 if (iAbs(d->wheelSwipeDistance) < width_Widget(d) / 4 && iAbs(d->swipeSpeed) < 4 * gap_UI) {
3899 abort = 1; 3907 abort = 1;
3900 } 3908 }