qulogic/libgnt

Use gnt_widget_get_mapped everywhere.

2019-04-08, Elliott Sales de Andrade
273129ba7062
Parents 78fc32338218
Children e2c09b8bd913
Use gnt_widget_get_mapped everywhere.
8 files changed, 24 insertions(+), 23 deletions(-)
  • +1 -1
    gntbox.c
  • +5 -6
    gntcombobox.c
  • +2 -3
    gntentry.c
  • +4 -2
    gntfilesel.c
  • +1 -1
    gntslider.c
  • +2 -3
    gnttextview.c
  • +6 -4
    gnttree.c
  • +3 -3
    gntwidget.c
    • --- a/gntbox.c Mon Apr 08 03:30:52 2019 -0400
    +++ b/gntbox.c Mon Apr 08 03:37:01 2019 -0400
    @@ -767,7 +767,7 @@
    box->focus = g_list_remove(box->focus, widget);
    }
    - if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(box), GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(GNT_WIDGET(box)))
    gnt_widget_draw(GNT_WIDGET(box));
    }
    --- a/gntcombobox.c Mon Apr 08 03:30:52 2019 -0400
    +++ b/gntcombobox.c Mon Apr 08 03:37:01 2019 -0400
    @@ -105,8 +105,7 @@
    static void
    gnt_combo_box_size_request(GntWidget *widget)
    {
    - if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
    - {
    + if (!gnt_widget_get_mapped(widget)) {
    GntWidget *dd = GNT_COMBO_BOX(widget)->dropdown;
    gnt_widget_size_request(dd);
    widget->priv.height = 3; /* For now, a combobox will have border */
    @@ -150,7 +149,7 @@
    gnt_combo_box_key_pressed(GntWidget *widget, const char *text)
    {
    GntComboBox *box = GNT_COMBO_BOX(widget);
    - gboolean showing = !!GNT_WIDGET_IS_FLAG_SET(box->dropdown->parent, GNT_WIDGET_MAPPED);
    + gboolean showing = gnt_widget_get_mapped(box->dropdown->parent);
    if (showing) {
    if (text[1] == 0) {
    @@ -215,7 +214,7 @@
    gnt_combo_box_lost_focus(GntWidget *widget)
    {
    GntComboBox *combo = GNT_COMBO_BOX(widget);
    - if (GNT_WIDGET_IS_FLAG_SET(combo->dropdown->parent, GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(combo->dropdown->parent))
    hide_popup(combo, FALSE);
    widget_lost_focus(widget);
    }
    @@ -225,7 +224,7 @@
    G_GNUC_UNUSED int x, G_GNUC_UNUSED int y)
    {
    GntComboBox *box = GNT_COMBO_BOX(widget);
    - gboolean dshowing = GNT_WIDGET_IS_FLAG_SET(box->dropdown->parent, GNT_WIDGET_MAPPED);
    + gboolean dshowing = gnt_widget_get_mapped(box->dropdown->parent);
    if (event == GNT_MOUSE_SCROLL_UP) {
    if (dshowing)
    @@ -255,7 +254,7 @@
    static gboolean
    dropdown_menu(GntBindable *b, G_GNUC_UNUSED GList *params)
    {
    - if (GNT_WIDGET_IS_FLAG_SET(GNT_COMBO_BOX(b)->dropdown->parent, GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(GNT_COMBO_BOX(b)->dropdown->parent))
    return FALSE;
    popup_dropdown(GNT_COMBO_BOX(b));
    return TRUE;
    --- a/gntentry.c Mon Apr 08 03:30:52 2019 -0400
    +++ b/gntentry.c Mon Apr 08 03:37:01 2019 -0400
    @@ -306,8 +306,7 @@
    static void
    gnt_entry_size_request(GntWidget *widget)
    {
    - if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
    - {
    + if (!gnt_widget_get_mapped(widget)) {
    widget->priv.height = 1;
    widget->priv.width = 20;
    }
    @@ -1102,7 +1101,7 @@
    if ((entry->cursor = entry->end - cursor) > entry->end)
    entry->cursor = entry->end;
    - if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(entry), GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(GNT_WIDGET(entry)))
    entry_redraw(GNT_WIDGET(entry));
    }
    --- a/gntfilesel.c Mon Apr 08 03:30:52 2019 -0400
    +++ b/gntfilesel.c Mon Apr 08 03:37:01 2019 -0400
    @@ -200,8 +200,9 @@
    gnt_tree_remove_all(GNT_TREE(sel->files));
    gnt_entry_set_text(GNT_ENTRY(sel->location), NULL);
    if (sel->current == NULL) {
    - if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(sel), GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(GNT_WIDGET(sel))) {
    gnt_widget_draw(GNT_WIDGET(sel));
    + }
    return TRUE;
    }
    @@ -240,8 +241,9 @@
    }
    }
    g_list_free_full(files, (GDestroyNotify)gnt_file_free);
    - if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(sel), GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(GNT_WIDGET(sel))) {
    gnt_widget_draw(GNT_WIDGET(sel));
    + }
    return TRUE;
    }
    --- a/gntslider.c Mon Apr 08 03:30:52 2019 -0400
    +++ b/gntslider.c Mon Apr 08 03:37:01 2019 -0400
    @@ -53,7 +53,7 @@
    redraw_slider(GntSlider *slider)
    {
    GntWidget *widget = GNT_WIDGET(slider);
    - if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(widget))
    gnt_widget_draw(widget);
    }
    --- a/gnttextview.c Mon Apr 08 03:30:52 2019 -0400
    +++ b/gnttextview.c Mon Apr 08 03:37:01 2019 -0400
    @@ -189,8 +189,7 @@
    static void
    gnt_text_view_size_request(GntWidget *widget)
    {
    - if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
    - {
    + if (!gnt_widget_get_mapped(widget)) {
    gnt_widget_set_size(widget, 64, 20);
    }
    }
    @@ -437,7 +436,7 @@
    static void
    gnt_text_view_size_changed(GntWidget *widget, int w, G_GNUC_UNUSED int h)
    {
    - if (w != widget->priv.width && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED)) {
    + if (w != widget->priv.width && gnt_widget_get_mapped(widget)) {
    gnt_text_view_reflow(GNT_TEXT_VIEW(widget));
    }
    }
    --- a/gnttree.c Mon Apr 08 03:30:52 2019 -0400
    +++ b/gnttree.c Mon Apr 08 03:37:01 2019 -0400
    @@ -426,7 +426,7 @@
    int rows, scrcol;
    int current = 0;
    - if (!GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_MAPPED))
    + if (!gnt_widget_get_mapped(GNT_WIDGET(tree)))
    return;
    pos = gnt_widget_get_has_border(widget) ? 1 : 0;
    @@ -1543,9 +1543,11 @@
    col->text = g_strdup(text ? text : "");
    }
    - if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_MAPPED) &&
    - get_distance(tree->top, row) >= 0 && get_distance(row, tree->bottom) >= 0)
    + if (gnt_widget_get_mapped(GNT_WIDGET(tree)) &&
    + get_distance(tree->top, row) >= 0 &&
    + get_distance(row, tree->bottom) >= 0) {
    redraw_tree(tree);
    + }
    }
    }
    @@ -1838,7 +1840,7 @@
    break;
    }
    }
    - if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(GNT_WIDGET(tree)))
    readjust_columns(tree);
    }
    --- a/gntwidget.c Mon Apr 08 03:30:52 2019 -0400
    +++ b/gntwidget.c Mon Apr 08 03:37:01 2019 -0400
    @@ -436,8 +436,7 @@
    if (height <= 0)
    height = widget->priv.height;
    - if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
    - {
    + if (gnt_widget_get_mapped(widget)) {
    ret = gnt_widget_confirm_size(widget, width, height);
    }
    @@ -517,8 +516,9 @@
    if (!g_object_get_data(G_OBJECT(widget), "gnt:queue_update"))
    return FALSE;
    - if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(widget)) {
    gnt_screen_update(widget);
    + }
    g_object_set_data(G_OBJECT(widget), "gnt:queue_update", NULL);
    return FALSE;
    }