openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

rename control_click to click_control

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-09-26 10:41:47 -05:00
committed by Celtic Minstrel
parent 56f3337e6f
commit d47249b404
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialogxml/dialogs/dialog.cpp
View File

@@ -564,7 +564,7 @@ void cDialog::handle_events() {
cFramerateLimiter fps_limiter; cFramerateLimiter fps_limiter;
while(dialogNotToast) { while(dialogNotToast) {
if(replaying && has_next_action("control_click")){ if(replaying && has_next_action("click_control")){
Element& next_action = pop_next_action(); Element& next_action = pop_next_action();
auto info = info_from_action(next_action); auto info = info_from_action(next_action);
if(info["id"].empty()) continue; if(info["id"].empty()) continue;

2
src/dialogxml/widgets/container.cpp
View File

@@ -70,7 +70,7 @@ bool cContainer::handleClick(location where, cFramerateLimiter& fps_limiter) {
void cContainer::callHandler(event_fcn<EVT_CLICK>::type onClick, cDialog& me, std::string id, eKeyMod mods) { void cContainer::callHandler(event_fcn<EVT_CLICK>::type onClick, cDialog& me, std::string id, eKeyMod mods) {
// When replaying, a click event for the specifically child control comes next // When replaying, a click event for the specifically child control comes next
if(replaying){ if(replaying){
auto child_click_action = pop_next_action("control_click"); auto child_click_action = pop_next_action("click_control");
auto info = info_from_action(child_click_action); auto info = info_from_action(child_click_action);
clicking = info["id"]; clicking = info["id"];
} }

2
src/dialogxml/widgets/control.cpp
View File

@@ -352,7 +352,7 @@ bool cControl::haveHandler(eDlogEvt t) const {
bool cControl::triggerClickHandler(cDialog& dlg, std::string id, eKeyMod mods){ bool cControl::triggerClickHandler(cDialog& dlg, std::string id, eKeyMod mods){
if(recording){ if(recording){
std::map<std::string, std::string> action_info = {{"id", id}, {"mods", boost::lexical_cast<std::string>(mods)}}; std::map<std::string, std::string> action_info = {{"id", id}, {"mods", boost::lexical_cast<std::string>(mods)}};
record_action("control_click", action_info); record_action("click_control", action_info);
} }
triggerEvent<EVT_CLICK>(dlg, id, mods); triggerEvent<EVT_CLICK>(dlg, id, mods);
return true; return true;

2
src/dialogxml/widgets/ledgroup.cpp
View File

@@ -73,7 +73,7 @@ bool cLedGroup::handleClick(location where, cFramerateLimiter& fps_limiter) {
void cLedGroup::callHandler(event_fcn<EVT_CLICK>::type onClick, cDialog& me, std::string id, eKeyMod mods) { void cLedGroup::callHandler(event_fcn<EVT_CLICK>::type onClick, cDialog& me, std::string id, eKeyMod mods) {
// When replaying, a click event for the specifically clicked led comes next // When replaying, a click event for the specifically clicked led comes next
if(replaying){ if(replaying){
auto led_click_action = pop_next_action("control_click"); auto led_click_action = pop_next_action("click_control");
auto info = info_from_action(led_click_action); auto info = info_from_action(led_click_action);
clicking = info["id"]; clicking = info["id"];
} }

4
src/tools/replay.cpp
View File

@@ -184,8 +184,8 @@ Element& pop_next_action(std::string expected_action_type) {
replay_fps_limit->frame_finished(); replay_fps_limit->frame_finished();
} }
// control_click actions are not meaningful for debugging // click_control actions are not meaningful for debugging
if (to_return->Value() != "control_click"){ if (to_return->Value() != "click_control"){
last_action_type = to_return->Value(); last_action_type = to_return->Value();
if(replay_verbose){ if(replay_verbose){

20
test/replays/short/Issue455.xml
View File

@@ -23,26 +23,26 @@ UIScaleMap = 1.5
<mods>1</mods> <mods>1</mods>
</startup_button_click> </startup_button_click>
<build_scen_headers>AnimatedTile.boes&#x0A;Boundary Test.boes&#x0A;Boundary Test 2.boes&#x0A;Display Picture.boes&#x0A;myscenario.boes&#x0A;thrakos.exs&#x0A;recttown.exs&#x0A;</build_scen_headers> <build_scen_headers>AnimatedTile.boes&#x0A;Boundary Test.boes&#x0A;Boundary Test 2.boes&#x0A;Display Picture.boes&#x0A;myscenario.boes&#x0A;thrakos.exs&#x0A;recttown.exs&#x0A;</build_scen_headers>
<control_click> <click_control>
<id>list</id> <id>list</id>
<mods>1</mods> <mods>1</mods>
</control_click> </click_control>
<control_click> <click_control>
<id>scen1</id> <id>scen1</id>
<mods>1</mods> <mods>1</mods>
</control_click> </click_control>
<control_click> <click_control>
<id>btn1</id> <id>btn1</id>
<mods>0</mods> <mods>0</mods>
</control_click> </click_control>
<move>(8,8)</move> <move>(8,8)</move>
<move>(9,7)</move> <move>(9,7)</move>
<move>(10,7)</move> <move>(10,7)</move>
<move>(11,7)</move> <move>(11,7)</move>
<control_click> <click_control>
<id>done</id> <id>done</id>
<mods>0</mods> <mods>0</mods>
</control_click> </click_control>
<move>(11,7)</move> <move>(11,7)</move>
<move>(12,8)</move> <move>(12,8)</move>
<move>(12,9)</move> <move>(12,9)</move>
@@ -58,8 +58,8 @@ UIScaleMap = 1.5
<word>Ask About...</word> <word>Ask About...</word>
</click_talk_rect> </click_talk_rect>
<field_focus>response</field_focus> <field_focus>response</field_focus>
<control_click> <click_control>
<id>okay</id> <id>okay</id>
<mods>0</mods> <mods>0</mods>
</control_click> </click_control>
</actions> </actions>