fix text box menu event handling mistake.
bchanf/trunk/src/tools/hmi_generator.rb (diff)| @@ -443,8 +443,22 @@ | ||
| 443 | 443 | i = cact_par(window-><%= self.name() %>.id, wev); |
| 444 | 444 | if (i & 0x2000) { |
| 445 | 445 | window-><%= self.name() %>.nextaction = True; |
| 446 | - <%= window_name %>_setflag(window, <%= window_name.upcase %>_FLAG_PARTS_OTHEREVENT); | |
| 447 | - wugt_evt(wev); | |
| 446 | + switch (i) { | |
| 447 | + case P_MENU: | |
| 448 | + if ((wev->s.type == EV_KEYDWN)&&(wev->s.stat & ES_CMD)) { | |
| 449 | + evt->type = <%= main_name.upcase %>EVENT_TYPE_<%= window_name.upcase %>_PARTS_<%= self.name().upcase %>_KEYMENU; | |
| 450 | + evt->data.<%= window_name %>_<%= self.name() %>_keymenu.keycode = wev->e.data.key.code; | |
| 451 | + } else { | |
| 452 | + evt->type = <%= main_name.upcase %>EVENT_TYPE_<%= window_name.upcase %>_PARTS_<%= self.name().upcase %>_MENU; | |
| 453 | + evt->data.<%= window_name %>_<%= self.name() %>_menu.pos = wev->s.pos; | |
| 454 | + } | |
| 455 | + <%= window_name %>_setflag(window, <%= window_name.upcase %>_FLAG_PARTS_NEXTACTION); | |
| 456 | + break; | |
| 457 | + default: | |
| 458 | + wugt_evt(wev); | |
| 459 | + <%= window_name %>_setflag(window, <%= window_name.upcase %>_FLAG_PARTS_OTHEREVENT); | |
| 460 | + break; | |
| 461 | + } | |
| 448 | 462 | return; |
| 449 | 463 | } |
| 450 | 464 | window-><%= self.name() %>.nextaction = False; |
| @@ -478,18 +492,6 @@ | ||
| 478 | 492 | evt->data.<%= window_name %>_<%= self.name() %>_copy.rel_wid = wev->s.wid; |
| 479 | 493 | evt->data.<%= window_name %>_<%= self.name() %>_copy.pos = wev->s.pos; |
| 480 | 494 | break; |
| 481 | - case P_MENU: | |
| 482 | - if ((wev->s.type == EV_KEYDWN)&&(wev->s.stat & ES_CMD)) { | |
| 483 | - evt->type = <%= main_name.upcase %>EVENT_TYPE_<%= window_name.upcase %>_PARTS_<%= self.name().upcase %>_KEYMENU; | |
| 484 | - evt->data.<%= window_name %>_<%= self.name() %>_keymenu.keycode = wev->e.data.key.code; | |
| 485 | - } else { | |
| 486 | - evt->type = <%= main_name.upcase %>EVENT_TYPE_<%= window_name.upcase %>_PARTS_<%= self.name().upcase %>_MENU; | |
| 487 | - evt->data.<%= window_name %>_<%= self.name() %>_menu.pos = wev->s.pos; | |
| 488 | - } | |
| 489 | - window-><%= self.name() %>.nextaction = True; | |
| 490 | - <%= window_name %>_setflag(window, <%= window_name.upcase %>_FLAG_PARTS_NEXTACTION); | |
| 491 | - wugt_evt(wev); | |
| 492 | - break; | |
| 493 | 495 | } |
| 494 | 496 | } |
| 495 | 497 |
