edit_OnChange() send EvText cpos and len. Fix GTK issue in edit_OnFilter().

Author: frang75

Changelog.md

@@ -8,12 +8,12 @@
 - `ekGUI_SCALE_ADJUST` to `gui_scale_t`, for `imageview_scale()`. [Commit](https://github.com/frang75/nappgui_src/commit/814e28b45ac1cbf91b70de412f55724b819e158a).
 - `button_min_width()`. [Commit](https://github.com/frang75/nappgui_src/commit/8639d19df195376620179e17f523646242a5e823).
 - `edit_min_width()`. [Commit](https://github.com/frang75/nappgui_src/commit/8639d19df195376620179e17f523646242a5e823).
+- `edit_min_height()`. [Commit]().
 - `button_get_font()`. [Commit](https://github.com/frang75/nappgui_src/commit/8639d19df195376620179e17f523646242a5e823).
 - `label_min_width()`. [Commit](https://github.com/frang75/nappgui_src/commit/bccc5d36a6ec9f68b0f3e682067da456b2b98ba4).
 - `label_get_font()`. [Commit](https://github.com/frang75/nappgui_src/commit/bccc5d36a6ec9f68b0f3e682067da456b2b98ba4).
 - `progress_min_width()`. [Commit](https://github.com/frang75/nappgui_src/commit/bccc5d36a6ec9f68b0f3e682067da456b2b98ba4).
 - `slider_min_width()`. [Commit](https://github.com/frang75/nappgui_src/commit/bccc5d36a6ec9f68b0f3e682067da456b2b98ba4).
-
 - Dynamic menus. [Doc](https://nappgui.com/en/gui/menu.html). [Issue](https://github.com/frang75/nappgui_src/issues/174). [Commit](https://github.com/frang75/nappgui_src/commit/bd9fb788c687bd7a6c31bf115cd9a82e2b87ffe2).
     * Renamed `menu_add_item()`, previously `menu_item()`.
     * Renamed `menu_count()`, previously `menu_size()`.
@@ -28,6 +28,8 @@
     * Added `menuitem_get_enabled()`.
     * Added `menuitem_get_visible()`.
     * Added `menuitem_get_state()`.
+- `edit_OnChange()` set `cpos` and `len` values in `EvText` event parameters. [Commit]().
+- `b64_encode_from_cstr()`. [Commit]().
 
 ### Changed
 
@@ -40,6 +42,9 @@
 - Issue in NRC generated string with new lines. [Issue](https://github.com/frang75/nappgui_src/issues/177). [Commit](https://github.com/frang75/nappgui_src/commit/c4359a9ff45e5c54547048f1046d64d5f22e987a).
 - Issue in `str_relpath()`. [Commit](https://github.com/frang75/nappgui_src/commit/b34b6832c361ada1acc3a6a3235ea2fa65a71d88).
 - `image_write()` in macOS, with indexed BMPs. [Commit](https://github.com/frang75/nappgui_src/commit/4bc8cd66ff0d4d9a341ad4a7cd17604cc36827f3).
+- Issue in `dbind()` default values in struct types. [Commit](https://github.com/frang75/nappgui_src/commit/73a8e0775588edd053ba707c8a748ce2b0b8c9e7).
+- Avoid GTK Warnings in `edit_OnFilter()` events with multiline controls. [Issue](https://github.com/frang75/nappgui_src/issues/187). [Commit]().
+- Excessive internal padding in GTK `button_flat()`. [Commit]().
 
 ### Build system
 

demo/guihello/seltext.c

@@ -11,7 +11,6 @@ typedef struct _sel_data_t SelData;
 struct _sel_data_t
 {
     Window *window;
-    Edit *edit;
     Edit *edit_range;
     Button *caps;
     TextView *text;
@@ -33,10 +32,10 @@ static void i_OnCopy(SelData *data, Event *e)
     cassert_no_null(data);
     unref(e);
     control = window_get_focus(data->window);
-    if (guicontrol_edit(control) == data->edit)
-        edit_copy(data->edit);
-    else if (guicontrol_textview(control) == data->text)
-        textview_copy(data->text);
+    if (guicontrol_edit(control) != NULL)
+        edit_copy(guicontrol_edit(control));
+    else if (guicontrol_textview(control) != NULL)
+        textview_copy(guicontrol_textview(control));
 }
 
 /*---------------------------------------------------------------------------*/
@@ -47,10 +46,10 @@ static void i_OnPaste(SelData *data, Event *e)
     cassert_no_null(data);
     unref(e);
     control = window_get_focus(data->window);
-    if (guicontrol_edit(control) == data->edit)
-        edit_paste(data->edit);
-    else if (guicontrol_textview(control) == data->text)
-        textview_paste(data->text);
+    if (guicontrol_edit(control) != NULL)
+        edit_paste(guicontrol_edit(control));
+    else if (guicontrol_textview(control) != NULL)
+        textview_paste(guicontrol_textview(control));
 }
 
 /*---------------------------------------------------------------------------*/
@@ -61,10 +60,10 @@ static void i_OnCut(SelData *data, Event *e)
     cassert_no_null(data);
     unref(e);
     control = window_get_focus(data->window);
-    if (guicontrol_edit(control) == data->edit)
-        edit_cut(data->edit);
-    else if (guicontrol_textview(control) == data->text)
-        textview_cut(data->text);
+    if (guicontrol_edit(control) != NULL)
+        edit_cut(guicontrol_edit(control));
+    else if (guicontrol_textview(control) != NULL)
+        textview_cut(guicontrol_textview(control));
 }
 
 /*---------------------------------------------------------------------------*/
@@ -83,10 +82,10 @@ static void i_OnSelect(SelData *data, Event *e)
     start = str_to_i32(tc(left), 10, NULL);
     end = str_to_i32(tc(right), 10, NULL);
 
-    if (guicontrol_edit(control) == data->edit)
-        edit_select(data->edit, start, end);
-    else if (guicontrol_textview(control) == data->text)
-        textview_select(data->text, start, end);
+    if (guicontrol_edit(control) != NULL)
+        edit_select(guicontrol_edit(control), start, end);
+    else if (guicontrol_textview(control) != NULL)
+        textview_select(guicontrol_textview(control), start, end);
 
     str_destroy(&left);
     str_destroy(&right);
@@ -103,7 +102,7 @@ static void i_OnWrap(SelData *data, Event *e)
 
 /*---------------------------------------------------------------------------*/
 
-static void i_OnEditFilter(SelData *data, Event *e)
+static void i_filter_event(SelData *data, Event *e, const char_t *name)
 {
     const EvText *p = event_params(e, EvText);
     cassert_no_null(data);
@@ -144,54 +143,32 @@ static void i_OnEditFilter(SelData *data, Event *e)
         r->apply = TRUE;
     }
 
-    textview_printf(data->info_text, "Edit: Pos %d Len %d\n", p->cpos, p->len);
+    textview_printf(data->info_text, "%s: Pos %d Len %d\n", name, p->cpos, p->len);
     textview_scroll_caret(data->info_text);
 }
 
 /*---------------------------------------------------------------------------*/
 
-static void i_OnTextViewFilter(SelData *data, Event *e)
+static void i_OnEditFilter(SelData *data, Event *e)
 {
-    const EvText *p = event_params(e, EvText);
-    cassert_no_null(data);
-
-    /*
-     * Convert the inserted text in caps.
-     * p->text the inserted text only (const).
-     * r->text the new filterd text.
-     * p->cpos current caret position.
-     * r->apply = TRUE means the editbox text has to be updated.
-     * p->len number of chars inserted at left of caret (to caps).
-     * We are working with UTF8-Strings. Sequential access.
-     */
-    if (button_get_state(data->caps) == ekGUI_ON && p->len > 0)
-    {
-        EvTextFilter *r = event_result(e, EvTextFilter);
-        const char_t *src = p->text;
-        char_t *dest = r->text;
-        uint32_t cp = unicode_to_u32(src, ekUTF8);
-        uint32_t pos = 0;
-        while (cp != 0)
-        {
-            uint32_t offset = 0;
+    i_filter_event(data, e, "Edit OnFilter");
+}
 
-            if (cp >= 'a' && cp <= 'z')
-                cp -= 32;
+/*---------------------------------------------------------------------------*/
 
-            offset = unicode_to_char(cp, dest, ekUTF8);
-            dest += offset;
-            src = unicode_next(src, ekUTF8);
-            cp = unicode_to_u32(src, ekUTF8);
-            pos += 1;
-        }
+static void i_OnEditChange(SelData *data, Event *e)
+{
+    const EvText *p = event_params(e, EvText);
+    cassert_no_null(data);
+    textview_printf(data->info_text, "Edit OnChange: Pos: %d Len %d\n", p->cpos, p->len);
+    textview_scroll_caret(data->info_text);
+}
 
-        *dest = 0;
-        r->cpos = p->cpos;
-        r->apply = TRUE;
-    }
+/*---------------------------------------------------------------------------*/
 
-    textview_printf(data->info_text, "TextView: Pos %d Len %d\n", p->cpos, p->len);
-    textview_scroll_caret(data->info_text);
+static void i_OnTextViewFilter(SelData *data, Event *e)
+{
+    i_filter_event(data, e, "TextView OnFilter");
 }
 
 /*---------------------------------------------------------------------------*/
@@ -245,37 +222,55 @@ static Layout *i_text_controls(SelData *data)
 
 static Layout *i_layout(SelData *data)
 {
-    Layout *layout1 = layout_create(1, 7);
+    Layout *layout1 = layout_create(1, 11);
     Layout *layout2 = i_text_controls(data);
     Label *label1 = label_create();
     Label *label2 = label_create();
     Label *label3 = label_create();
-    Edit *edit = edit_create();
+    Label *label4 = label_create();
+    Label *label5 = label_create();
+    Edit *edit1 = edit_create();
+    Edit *edit2 = edit_multiline();
+    Edit *edit3 = edit_multiline();
     TextView *text1 = textview_create();
     TextView *text2 = textview_create();
     cassert_no_null(data);
     label_text(label1, "EditBox");
-    label_text(label2, "TextView");
-    label_text(label3, "Info");
-    edit_text(edit, "This is a text in the EditBox control");
-    edit_OnFilter(edit, listener(data, i_OnEditFilter, SelData));
+    label_text(label2, "EditBox (multiline)");
+    label_text(label3, "EditBox (multiline with user-height)");
+    label_text(label4, "TextView");
+    label_text(label5, "Info");
+    edit_text(edit1, "This is a text in the EditBox control");
+    edit_text(edit2, "This is a text in the multiline EditBox control");
+    edit_text(edit3, "This is a text in the multiline EditBox control");
+    edit_min_height(edit3, 100);
+    edit_OnFilter(edit1, listener(data, i_OnEditFilter, SelData));
+    edit_OnFilter(edit2, listener(data, i_OnEditFilter, SelData));
+    edit_OnFilter(edit3, listener(data, i_OnEditFilter, SelData));
+    edit_OnChange(edit1, listener(data, i_OnEditChange, SelData));
+    edit_OnChange(edit2, listener(data, i_OnEditChange, SelData));
+    edit_OnChange(edit3, listener(data, i_OnEditChange, SelData));
     textview_writef(text1, "This is another text in the TextView control, wider than the control.");
     textview_editable(text1, TRUE);
     textview_OnFilter(text1, listener(data, i_OnTextViewFilter, SelData));
     layout_label(layout1, label1, 0, 0);
-    layout_edit(layout1, edit, 0, 1);
+    layout_edit(layout1, edit1, 0, 1);
     layout_label(layout1, label2, 0, 2);
-    layout_textview(layout1, text1, 0, 3);
-    layout_layout(layout1, layout2, 0, 4);
-    layout_label(layout1, label3, 0, 5);
-    layout_textview(layout1, text2, 0, 6);
-    layout_tabstop(layout1, 0, 3, TRUE);
-    layout_tabstop(layout1, 0, 4, FALSE);
-    layout_halign(layout1, 0, 4, ekLEFT);
+    layout_edit(layout1, edit2, 0, 3);
+    layout_label(layout1, label3, 0, 4);
+    layout_edit(layout1, edit3, 0, 5);
+    layout_label(layout1, label4, 0, 6);
+    layout_textview(layout1, text1, 0, 7);
+    layout_layout(layout1, layout2, 0, 8);
+    layout_label(layout1, label5, 0, 9);
+    layout_textview(layout1, text2, 0, 10);
+    layout_tabstop(layout1, 0, 7, TRUE);
+    layout_tabstop(layout1, 0, 8, FALSE);
+    layout_halign(layout1, 0, 8, ekLEFT);
     layout_vmargin(layout1, 1, 5);
     layout_vmargin(layout1, 3, 5);
-    layout_vmargin(layout1, 4, 5);
-    data->edit = edit;
+    layout_vmargin(layout1, 5, 5);
+    layout_vmargin(layout1, 7, 5);
     data->text = text1;
     data->info_text = text2;
     return layout1;

prj/build.txt

@@ -1 +1 @@
-5995
+6016

src/gui/edit.c

@@ -33,6 +33,7 @@ struct _edit_t
     GuiComponent component;
     uint32_t flags;
     real32_t width;
+    real32_t height;
     S2Df size;
     bool_t is_focused;
     bool_t is_placeholder_active;
@@ -216,6 +217,7 @@ static Edit *i_create(const align_t halign, const uint32_t flags)
     void *ositem = NULL;
     edit->flags = flags;
     edit->width = 100;
+    edit->height = -1;
     edit->text = str_c("");
     edit->font = _gui_create_default_font();
     edit->color = kCOLOR_DEFAULT;
@@ -282,6 +284,16 @@ void edit_min_width(Edit *edit, const real32_t width)
 
 /*---------------------------------------------------------------------------*/
 
+void edit_min_height(Edit *edit, const real32_t height)
+{
+    cassert_no_null(edit);
+    cassert(height > 0);
+    cassert(edit_get_type(edit->flags) == ekEDIT_MULTI);
+    edit->height = height;
+}
+
+/*---------------------------------------------------------------------------*/
+
 void edit_text(Edit *edit, const char_t *text)
 {
     cassert_no_null(edit);
@@ -491,8 +503,12 @@ void _edit_dimension(Edit *edit, const uint32_t i, real32_t *dim0, real32_t *dim
     }
     else
     {
+        /* The height set by the user cannot be lower than the height of a single - line control */
         cassert(i == 1);
-        *dim1 = edit->size.height;
+        if (edit_get_type(edit->flags) == ekEDIT_MULTI && edit->height > edit->size.height)
+            *dim1 = edit->height;
+        else
+            *dim1 = edit->size.height;
     }
 }
 

src/gui/edit.h

@@ -27,6 +27,8 @@ _gui_api void edit_OnFocus(Edit *edit, Listener *listener);
 
 _gui_api void edit_min_width(Edit *edit, const real32_t width);
 
+_gui_api void edit_min_height(Edit *edit, const real32_t height);
+
 _gui_api void edit_text(Edit *edit, const char_t *text);
 
 _gui_api void edit_font(Edit *edit, const Font *font);

src/inet/base64.c

@@ -209,6 +209,15 @@ String *b64_encode_from_str(const String *str)
 
 /*---------------------------------------------------------------------------*/
 
+String *b64_encode_from_cstr(const char_t *str)
+{
+    const byte_t *data = cast_const(str, byte_t);
+    uint32_t size = str_len_c(str);
+    return i_encode_from_data(data, size);
+}
+
+/*---------------------------------------------------------------------------*/
+
 Buffer *b64_decode_from_str(const String *base64)
 {
     const byte_t *data = cast_const(tc(base64), byte_t);

src/inet/base64.h

@@ -29,6 +29,8 @@ String *b64_encode_from_data(const byte_t *data, const uint32_t size);
 
 String *b64_encode_from_str(const String *str);
 
+String *b64_encode_from_cstr(const char_t *str);
+
 Buffer *b64_decode_from_str(const String *base64);
 
 Buffer *b64_decode_from_data(const byte_t *data, const uint32_t size);