From 55cd303c52a8fe524e15bd618bfcb02b8ff7dcb7 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= jaakko.keranen@iki.fi

Date: Wed, 8 Sep 2021 19:04:20 +0300

Subject: [PATCH 1/1] Cleanup

src/ui/mobile.c | 2 +-

src/ui/mobile.h | 2 +-

src/ui/util.c | 91 +++++++++++++++++++++----------------------------

3 files changed, 41 insertions(+), 54 deletions(-)

diff --git a/src/ui/mobile.c b/src/ui/mobile.c

index 48f17c9c..7e359a84 100644

--- a/src/ui/mobile.c

+++ b/src/ui/mobile.c

@@ -512,7 +512,7 @@ void makePanelItems_Mobile(iWidget *panel, const iMenuItem *itemsNullTerminated) 

 }

}

-iWidget *makeSplitMultiPanel_Mobile(const iMenuItem *itemsNullTerminated) {

+iWidget *makePanels_Mobile(const iMenuItem *itemsNullTerminated) { 

 /* A multipanel widget has a top panel and one or more detail panels. In a horizontal layout,


    the detail panels slide in from the right and cover the top panel. In a landscape layout,


    the detail panels are always visible on the side. */

diff --git a/src/ui/mobile.h b/src/ui/mobile.h

index 50b89e32..5e2d8957 100644

--- a/src/ui/mobile.h

+++ b/src/ui/mobile.h

@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */

iDeclareType(Widget)

iDeclareType(MenuItem)

-iWidget * makeSplitMultiPanel_Mobile (const iMenuItem *itemsNullTerminated);

+iWidget * makePanels_Mobile (const iMenuItem *itemsNullTerminated);

void setupMenuTransition_Mobile (iWidget *menu, iBool isIncoming);

void setupSheetTransition_Mobile (iWidget *sheet, iBool isIncoming);

diff --git a/src/ui/util.c b/src/ui/util.c

index 0d9338b5..22d8bce4 100644

--- a/src/ui/util.c

+++ b/src/ui/util.c

@@ -1617,11 +1617,23 @@ iInputWidget *addTwoColumnDialogInputField_Widget(iWidget *headings, iWidget *va 

 return input;

}

+static void addDialogPadding_(iWidget *headings, iWidget *values) {

+}

static void addPrefsInputWithHeading_(iWidget *headings, iWidget *values, 

                                   const char *id, iInputWidget *input) {


 addDialogInputWithHeading_(headings, values, format_CStr("${%s}", id), id, input);

}

+static void addDialogToggle_(iWidget *headings, iWidget *values,

+}

static size_t findWidestItemLabel_(const iMenuItem *items, size_t num) { 

 int widest = 0;


 size_t widestPos = iInvalidPos;

@@ -1830,9 +1842,9 @@ iWidget *makePreferences_Widget(void) { 

     };


     iString *aboutText = collectNew_String(); {


         setCStr_String(aboutText, "Lagrange " LAGRANGE_APP_VERSION);

-#if defined (iPlatformAppleMobile) 

         appendCStr_String(aboutText, " (" LAGRANGE_IOS_VERSION ")");

-#endif 

     }


     const iMenuItem aboutPanelItems[] = {


         { format_CStr("heading text:%s", cstr_String(aboutText)) },

@@ -1842,8 +1854,8 @@ iWidget *makePreferences_Widget(void) { 

         { "button text:" info_Icon " ${menu.aboutpages}", 0, 0, "!open url:about:about" },


         { "button text:" bug_Icon " ${menu.debug}", 0, 0, "!open url:about:debug" },


         { NULL }


         { "panel icon:0x2699 id:heading.prefs.general", 0, 0, (const void *) generalPanelItems },


         { "panel icon:0x1f5a7 id:heading.prefs.network", 0, 0, (const void *) networkPanelItems },


         { "panel text:" person_Icon " ${sidebar.identities}", 0, 0, (const void *) identityPanelItems },

@@ -1857,8 +1869,7 @@ iWidget *makePreferences_Widget(void) { 

         { "padding" },


         { "panel text:" planet_Icon " ${menu.about}", 0, 0, (const void *) aboutPanelItems },


         { NULL }


     setupSheetTransition_Mobile(dlg, iTrue);


     return dlg;


 }

@@ -1870,7 +1881,6 @@ iWidget *makePreferences_Widget(void) { 

 setBackgroundColor_Widget(findChild_Widget(tabs, "tabs.buttons"), uiBackgroundSidebar_ColorId);


 setId_Widget(tabs, "prefs.tabs");


 iWidget *headings, *values;


 /* General preferences. */ {


     appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.general}", '1', &headings, &values);

#if defined (LAGRANGE_ENABLE_DOWNLOAD_EDIT)

@@ -1879,12 +1889,9 @@ iWidget *makePreferences_Widget(void) { 

     iInputWidget *searchUrl;


     addPrefsInputWithHeading_(headings, values, "prefs.searchurl", iClob(searchUrl = new_InputWidget(0)));


     setUrlContent_InputWidget(searchUrl, iTrue);


     if (deviceType_App() != phone_AppDeviceType) {


         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.pinsplit}")));


         iWidget *pinSplit = new_Widget();

@@ -1895,8 +1902,7 @@ iWidget *makePreferences_Widget(void) { 

         }


         addChildFlags_Widget(values, iClob(pinSplit), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);


     }


     /* UI languages. */ {


         iArray *uiLangs = collectNew_Array(sizeof(iMenuItem));


         pushBackN_Array(uiLangs, langItems, iElemCount(langItems) - 1);

@@ -1915,8 +1921,7 @@ iWidget *makePreferences_Widget(void) { 

 /* User Interface. */ {


     appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.interface}", '2', &headings, &values);

#if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)

#endif 

     addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.returnkey}")));


     /* Return key behaviors. */ {

@@ -1931,11 +1936,9 @@ iWidget *makePreferences_Widget(void) { 

         setId_Widget(addChildFlags_Widget(values, iClob(returnKey), alignLeft_WidgetFlag),


                      "prefs.returnkey");


     }


     makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values);


     /* Scroll speeds. */ {


         for (int type = 0; type < max_ScrollType; type++) {


             const char *typeStr = (type == mouse_ScrollType ? "mouse" : "keyboard");

@@ -1955,25 +1958,21 @@ iWidget *makePreferences_Widget(void) { 

                 values, iClob(scrollSpeed), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);


         }


     }


     if (deviceType_App() == phone_AppDeviceType) {


     }


     makeTwoColumnHeading_("${heading.prefs.sizing}", headings, values);


     addPrefsInputWithHeading_(headings, values, "prefs.uiscale", iClob(new_InputWidget(8)));


     if (deviceType_App() == desktop_AppDeviceType) {


     }


 }


 /* Colors. */ {


     appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.colors}", '3', &headings, &values);


     makeTwoColumnHeading_("${heading.prefs.uitheme}", headings, values);

#if defined (iPlatformApple) || defined (iPlatformMSys)

#endif 

     addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.theme}")));


     iWidget *themes = new_Widget();

@@ -2034,8 +2033,7 @@ iWidget *makePreferences_Widget(void) { 

         addFontButtons_(values, "headingfont");


         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font}")));


         addFontButtons_(values, "font");


         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.mono}")));


         iWidget *mono = new_Widget(); {


             iWidget *tog;

@@ -2067,8 +2065,7 @@ iWidget *makePreferences_Widget(void) { 

             updateSize_LabelWidget((iLabelWidget *) tog);


         }


         addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);


         /* Custom font. */ {


             iInputWidget *customFont = new_InputWidget(0);


             setHint_InputWidget(customFont, "${hint.prefs.userfont}");

@@ -2097,19 +2094,12 @@ iWidget *makePreferences_Widget(void) { 

         addRadioButton_(quote, "prefs.quoteicon.0", "${prefs.quoteicon.line}", "quoteicon.set arg:0");


     }


     addChildFlags_Widget(values, iClob(quote), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);

-// makeTwoColumnHeading_("${heading.prefs.widelayout}", headings, values); 

 }


 /* Network. */ {


     appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.network}", '6', &headings, &values);

@@ -2181,12 +2171,9 @@ iWidget *makeBookmarkEditor_Widget(void) { 

 addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));


 addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));


 makeTwoColumnHeading_("${heading.bookmark.tags}", headings, values);


 arrange_Widget(dlg);


 for (int i = 0; i < 3; ++i) {


     as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;

--

2.25.1

Proxy Information
Original URL
gemini://git.skyjake.fi/lagrange/work%2Fv1.7/patch/55cd303c52a8fe524e15bd618bfcb02b8ff7dcb7.patch
Status Code
Success (20)
Meta
text/plain
Capsule Response Time
74.094716 milliseconds
Gemini-to-HTML Time
4.35459 milliseconds

This content has been proxied by September (3851b).