zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed action activation

Browse source
This commit is contained in:
anhefti 2021-05-18 15:41:32 +02:00
parent a172326fa5
commit b2a0016a9c
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java
View file

@ -119,7 +119,7 @@ public class ActionPane implements TemplateComposer {
continue; continue;
} }
de_activate_action_icon(event, parent, actionItem); de_activate_action_icon(event, parent, actionItem, ad);
} }
if (event.decoration != null) { if (event.decoration != null) {
@ -131,7 +131,7 @@ public class ActionPane implements TemplateComposer {
actionItemToDecorate, event.decoration._2.title); actionItemToDecorate, event.decoration._2.title);
} }
de_activate_action_icon(event, parent, actionItemToDecorate); de_activate_action_icon(event, parent, actionItemToDecorate, event.decoration._1);
} }
}); });
} }
@ -139,12 +139,13 @@ public class ActionPane implements TemplateComposer {
private void de_activate_action_icon( private void de_activate_action_icon(
final ActionActivationEvent event, final ActionActivationEvent event,
final Composite parent, final Composite parent,
final TreeItem actionItemToDecorate) { final TreeItem actionItemToDecorate,
final ActionDefinition actionDef) {
final PageAction action = (PageAction) actionItemToDecorate.getData(ACTION_EVENT_CALL_KEY); final PageAction action = (PageAction) actionItemToDecorate.getData(ACTION_EVENT_CALL_KEY);
final Image image = event.activation final Image image = event.activation
? event.decoration._1.icon.getImage(parent.getDisplay()) ? actionDef.icon.getImage(parent.getDisplay())
: event.decoration._1.icon.getGreyedImage(parent.getDisplay()); : actionDef.icon.getGreyedImage(parent.getDisplay());
actionItemToDecorate.setImage(image); actionItemToDecorate.setImage(image);
if (event.activation) { if (event.activation) {
actionItemToDecorate.setForeground(null); actionItemToDecorate.setForeground(null);
@ -153,7 +154,7 @@ public class ActionPane implements TemplateComposer {
.setForeground(new Color(parent.getDisplay(), new RGBA(150, 150, 150, 50))); .setForeground(new Color(parent.getDisplay(), new RGBA(150, 150, 150, 50)));
ActionPane.this.pageService.getPolyglotPageService().injectI18n( ActionPane.this.pageService.getPolyglotPageService().injectI18n(
actionItemToDecorate, actionItemToDecorate,
(action != null) ? action.getTitle() : event.decoration._1.title); (action != null) ? action.getTitle() : actionDef.title);
} }
} }