beu/TrackManiaControl
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

fml fix

Browse Source
This commit is contained in:
Steffen Schröder
2014-01-05 14:12:32 +01:00
parent 7aa53eda87
commit 5f27ab3e4a
1 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
application/core/FML/Script/Script.php
View File

@@ -396,7 +396,7 @@ Void " . self::FUNCTION_SETTOOLTIPTEXT . "(CMlControl _TooltipControl, CMlContro
if (!$this->tooltips) return ""; if (!$this->tooltips) return "";
$mouseOverScript = " $mouseOverScript = "
if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) { if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) {
if (Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_ONCLICK . "\")) break; if (!Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_ONCLICK . "\")) {
declare Invert = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_INVERT . "\"); declare Invert = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_INVERT . "\");
foreach (ControlClass in Event.Control.ControlClasses) { foreach (ControlClass in Event.Control.ControlClasses) {
declare TooltipControl <=> Page.GetFirstChild(ControlClass); declare TooltipControl <=> Page.GetFirstChild(ControlClass);
@@ -404,12 +404,14 @@ if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) {
TooltipControl.Visible = !Invert; TooltipControl.Visible = !Invert;
" . self::FUNCTION_SETTOOLTIPTEXT . "(TooltipControl, Event.Control); " . self::FUNCTION_SETTOOLTIPTEXT . "(TooltipControl, Event.Control);
} }
}
}"; }";
$mouseOutScript = " $mouseOutScript = "
if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) { if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) {
if (!Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_ONCLICK . "\")) {
declare FML_Clicked for Event.Control = False; declare FML_Clicked for Event.Control = False;
declare StayOnClick = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_STAYONCLICK . "\"); declare StayOnClick = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_STAYONCLICK . "\");
if (StayOnClick && FML_Clicked) break; if (!StayOnClick || !FML_Clicked) {
declare Invert = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_INVERT . "\"); declare Invert = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_INVERT . "\");
foreach (ControlClass in Event.Control.ControlClasses) { foreach (ControlClass in Event.Control.ControlClasses) {
declare TooltipControl <=> Page.GetFirstChild(ControlClass); declare TooltipControl <=> Page.GetFirstChild(ControlClass);
@@ -417,31 +419,38 @@ if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) {
TooltipControl.Visible = Invert; TooltipControl.Visible = Invert;
" . self::FUNCTION_SETTOOLTIPTEXT . "(TooltipControl, Event.Control); " . self::FUNCTION_SETTOOLTIPTEXT . "(TooltipControl, Event.Control);
} }
}
}
}"; }";
$mouseClickScript = " $mouseClickScript = "
if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) { if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) {
declare Handle = True;
declare Show = False; declare Show = False;
declare OnClick = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_ONCLICK . "\"); declare OnClick = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_ONCLICK . "\");
if (OnClick) { if (!OnClick) {
Show = !Event.Control.Visible;
} else {
declare StayOnClick = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_STAYONCLICK . "\"); declare StayOnClick = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_STAYONCLICK . "\");
if (StayOnClick) { if (StayOnClick) {
declare FML_Clicked for Event.Control = False; declare FML_Clicked for Event.Control = False;
FML_Clicked = !FML_Clicked; FML_Clicked = !FML_Clicked;
if (FML_Clicked) break; if (FML_Clicked) {
Show = False; Handle = False;
} else { } else {
break; Show = False;
}
} else {
Handle = False;
} }
} }
if (Handle) {
declare Invert = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_INVERT . "\"); declare Invert = Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_INVERT . "\");
foreach (ControlClass in Event.Control.ControlClasses) { foreach (ControlClass in Event.Control.ControlClasses) {
declare TooltipControl <=> Page.GetFirstChild(ControlClass); declare TooltipControl <=> Page.GetFirstChild(ControlClass);
if (TooltipControl == Null) continue; if (TooltipControl == Null) continue;
if (OnClick) Show = !TooltipControl.Visible;
TooltipControl.Visible = Show && !Invert; TooltipControl.Visible = Show && !Invert;
" . self::FUNCTION_SETTOOLTIPTEXT . "(TooltipControl, Event.Control); " . self::FUNCTION_SETTOOLTIPTEXT . "(TooltipControl, Event.Control);
} }
}
}"; }";
$tooltipsLabels = Builder::getLabelImplementationBlock(self::LABEL_MOUSEOVER, $mouseOverScript); $tooltipsLabels = Builder::getLabelImplementationBlock(self::LABEL_MOUSEOVER, $mouseOverScript);
$tooltipsLabels .= Builder::getLabelImplementationBlock(self::LABEL_MOUSEOUT, $mouseOutScript); $tooltipsLabels .= Builder::getLabelImplementationBlock(self::LABEL_MOUSEOUT, $mouseOutScript);