mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

(widget_default_set_state): clarify set of widget state's exclusive bits.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-01-06 13:00:15 +03:00
parent fbfb4f565c
commit 3a3171c990
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/widget/widget-common.c
View File

@ -788,14 +788,23 @@ widget_default_set_state (Widget * w, widget_state_t state, gboolean enable)
if (enable) if (enable)
{ {
/* exclusive bits */ /* exclusive bits */
if ((state & WST_CONSTRUCT) != 0) switch (state)
{
case WST_CONSTRUCT:
w->state &= ~(WST_ACTIVE | WST_SUSPENDED | WST_CLOSED); w->state &= ~(WST_ACTIVE | WST_SUSPENDED | WST_CLOSED);
else if ((state & WST_ACTIVE) != 0) break;
case WST_ACTIVE:
w->state &= ~(WST_CONSTRUCT | WST_SUSPENDED | WST_CLOSED); w->state &= ~(WST_CONSTRUCT | WST_SUSPENDED | WST_CLOSED);
else if ((state & WST_SUSPENDED) != 0) break;
case WST_SUSPENDED:
w->state &= ~(WST_CONSTRUCT | WST_ACTIVE | WST_CLOSED); w->state &= ~(WST_CONSTRUCT | WST_ACTIVE | WST_CLOSED);
else if ((state & WST_CLOSED) != 0) break;
case WST_CLOSED:
w->state &= ~(WST_CONSTRUCT | WST_ACTIVE | WST_SUSPENDED); w->state &= ~(WST_CONSTRUCT | WST_ACTIVE | WST_SUSPENDED);
break;
default:
break;
}
} }
if (owner == NULL) if (owner == NULL)
@ -820,7 +829,6 @@ widget_default_set_state (Widget * w, widget_state_t state, gboolean enable)
} }
break; break;
case WST_DISABLED: case WST_DISABLED:
ret = send_message (w, NULL, enable ? MSG_DISABLE : MSG_ENABLE, 0, NULL); ret = send_message (w, NULL, enable ? MSG_DISABLE : MSG_ENABLE, 0, NULL);
if (ret == MSG_HANDLED && widget_get_state (owner, WST_ACTIVE)) if (ret == MSG_HANDLED && widget_get_state (owner, WST_ACTIVE))