qulogic/libgnt

Use various other widget flag accessors.

2019-04-08, Elliott Sales de Andrade
e000a7bfaccd
Parents e2c09b8bd913
Children c8ca009d57a9
Use various other widget flag accessors.
4 files changed, 18 insertions(+), 10 deletions(-)
  • +1 -1
    gntbox.c
  • +13 -5
    gntwidget.c
  • +3 -3
    gntwm.c
  • +1 -1
    gntws.c
    • --- a/gntbox.c Mon Apr 08 03:45:13 2019 -0400
    +++ b/gntbox.c Mon Apr 08 03:51:46 2019 -0400
    @@ -307,7 +307,7 @@
    GntBox *box = GNT_BOX(widget);
    gboolean ret;
    - if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_DISABLE_ACTIONS))
    + if (!gnt_widget_get_disable_actions(widget))
    return FALSE;
    if (box->active == NULL && !find_focusable_widget(box))
    --- a/gntwidget.c Mon Apr 08 03:45:13 2019 -0400
    +++ b/gntwidget.c Mon Apr 08 03:51:46 2019 -0400
    @@ -91,13 +91,20 @@
    gnt_widget_dummy_confirm_size(GntWidget *widget, int width, int height)
    {
    gboolean shadow;
    - if (width < widget->priv.minw || height < widget->priv.minh)
    + if (width < widget->priv.minw || height < widget->priv.minh) {
    return FALSE;
    + }
    +
    shadow = gnt_widget_has_shadow(widget);
    - if (widget->priv.width + shadow != width && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_X))
    + if (widget->priv.width + shadow != width &&
    + !gnt_widget_get_grow_x(widget)) {
    return FALSE;
    - if (widget->priv.height + shadow != height && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_Y))
    + }
    + if (widget->priv.height + shadow != height &&
    + !gnt_widget_get_grow_y(widget)) {
    return FALSE;
    + }
    +
    return TRUE;
    }
    @@ -312,9 +319,10 @@
    if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_CAN_TAKE_FOCUS))
    return FALSE;
    - if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_DISABLE_ACTIONS) &&
    - gnt_bindable_perform_action_key(GNT_BINDABLE(widget), keys))
    + if (!gnt_widget_get_disable_actions(widget) &&
    + gnt_bindable_perform_action_key(GNT_BINDABLE(widget), keys)) {
    return TRUE;
    + }
    keys = gnt_bindable_remap_keys(GNT_BINDABLE(widget), keys);
    g_signal_emit(widget, signals[SIG_KEY_PRESSED], 0, keys, &ret);
    --- a/gntwm.c Mon Apr 08 03:45:13 2019 -0400
    +++ b/gntwm.c Mon Apr 08 03:51:46 2019 -0400
    @@ -439,7 +439,7 @@
    pos = 0;
    } else
    wid = g_list_nth_data(wm->cws->list, pos);
    - } while (urgent && !GNT_WIDGET_IS_FLAG_SET(wid, GNT_WIDGET_URGENT) && pos != orgpos);
    + } while (urgent && !gnt_widget_get_is_urgent(wid) && pos != orgpos);
    gnt_wm_raise_window(wm, wid);
    }
    @@ -1713,7 +1713,7 @@
    if (wm->cws->ordered && wid == wm->cws->ordered->data)
    flag |= GNT_TEXT_FLAG_DIM;
    - else if (GNT_WIDGET_IS_FLAG_SET(wid, GNT_WIDGET_URGENT))
    + else if (gnt_widget_get_is_urgent(wid))
    flag |= GNT_TEXT_FLAG_BOLD;
    gnt_tree_set_row_flags(GNT_TREE(wm->windows->tree), wid, flag);
    @@ -2195,7 +2195,7 @@
    gnt_wm_copy_win(widget, node);
    gnt_ws_draw_taskbar(wm->cws, FALSE);
    update_screen(wm);
    - } else if (ws && ws != wm->cws && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_URGENT)) {
    + } else if (ws && ws != wm->cws && gnt_widget_get_is_urgent(widget)) {
    if (!act || (act && !g_list_find(act, ws)))
    act = g_list_prepend(act, ws);
    update_act_msg();
    --- a/gntws.c Mon Apr 08 03:45:13 2019 -0400
    +++ b/gntws.c Mon Apr 08 03:51:46 2019 -0400
    @@ -110,7 +110,7 @@
    if (w == ws->ordered->data) {
    /* This is the current window in focus */
    color = GNT_COLOR_TITLE;
    - } else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_URGENT)) {
    + } else if (gnt_widget_get_is_urgent(w)) {
    /* This is a window with the URGENT hint set */
    color = GNT_COLOR_URGENT;
    } else {