mirror of
https://github.com/labwc/labwc.git
synced 2025-11-02 09:01:47 -05:00
src/action.c: add none branch to the ForEach action
This allows implementing a run_or_raise behavior. For an example see https://github.com/labwc/labwc/pull/1710#issuecomment-2054002641 Fixes: #1298
This commit is contained in:
parent
c841a25acf
commit
76bdaac4dc
2 changed files with 26 additions and 4 deletions
|
|
@ -47,6 +47,7 @@ static bool in_window_rules;
|
|||
static bool in_action_query;
|
||||
static bool in_action_then_branch;
|
||||
static bool in_action_else_branch;
|
||||
static bool in_action_none_branch;
|
||||
|
||||
static struct usable_area_override *current_usable_area_override;
|
||||
static struct keybind *current_keybind;
|
||||
|
|
@ -282,6 +283,7 @@ fill_child_action(char *nodename, char *content, struct action *parent,
|
|||
string_truncate_at_pattern(nodename, ".mousebind.context.mouse");
|
||||
string_truncate_at_pattern(nodename, ".then.action");
|
||||
string_truncate_at_pattern(nodename, ".else.action");
|
||||
string_truncate_at_pattern(nodename, ".none.action");
|
||||
|
||||
if (!strcasecmp(nodename, "action")) {
|
||||
current_child_action = NULL;
|
||||
|
|
@ -731,6 +733,9 @@ entry(xmlNode *node, char *nodename, char *content)
|
|||
} else if (in_action_else_branch) {
|
||||
fill_child_action(nodename, content,
|
||||
current_keybind_action, "else");
|
||||
} else if (in_action_none_branch) {
|
||||
fill_child_action(nodename, content,
|
||||
current_keybind_action, "none");
|
||||
} else {
|
||||
fill_keybind(nodename, content);
|
||||
}
|
||||
|
|
@ -745,6 +750,9 @@ entry(xmlNode *node, char *nodename, char *content)
|
|||
} else if (in_action_else_branch) {
|
||||
fill_child_action(nodename, content,
|
||||
current_mousebind_action, "else");
|
||||
} else if (in_action_none_branch) {
|
||||
fill_child_action(nodename, content,
|
||||
current_mousebind_action, "none");
|
||||
} else {
|
||||
fill_mousebind(nodename, content);
|
||||
}
|
||||
|
|
@ -1085,6 +1093,12 @@ xml_tree_walk(xmlNode *node)
|
|||
in_action_else_branch = false;
|
||||
continue;
|
||||
}
|
||||
if (!strcasecmp((char *)n->name, "none")) {
|
||||
in_action_none_branch = true;
|
||||
traverse(n);
|
||||
in_action_none_branch = false;
|
||||
continue;
|
||||
}
|
||||
traverse(n);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue