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

fml fix

Browse Source
This commit is contained in:
Steffen Schröder 2014-01-05 12:11:40 +01:00
parent 376dc77701
commit 1091afb771
1 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,7 +395,7 @@ Void " . self::FUNCTION_SETTOOLTIPTEXT . "(CMlControl _TooltipControl, CMlContro
private function getTooltipLabels() { private function getTooltipLabels() {
if (!$this->tooltips) return ""; if (!$this->tooltips) return "";
$mouseOverScript = " $mouseOverScript = "
if (!Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) break; if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) {
if (Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_ONCLICK . "\")) break; if (Event.Control.HasClass(\"" . self::OPTION_TOOLTIP_ONCLICK . "\")) break;
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) {
@ -403,9 +403,10 @@ foreach (ControlClass in Event.Control.ControlClasses) {
if (TooltipControl == Null) continue; if (TooltipControl == Null) continue;
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 . "\")) break; if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) {
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) break;
@ -415,9 +416,10 @@ foreach (ControlClass in Event.Control.ControlClasses) {
if (TooltipControl == Null) continue; if (TooltipControl == Null) continue;
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 . "\")) break; if (Event.Control.HasClass(\"" . self::CLASS_TOOLTIPS . "\")) {
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) {
@ -439,6 +441,7 @@ foreach (ControlClass in Event.Control.ControlClasses) {
if (TooltipControl == Null) continue; if (TooltipControl == Null) continue;
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);
@ -467,11 +470,7 @@ if (Event.Control.HasClass(\"" . self::CLASS_MENUBUTTON . "\")) {
Page.GetClassChildren(MenuIdClass, Page.MainFrame, True); Page.GetClassChildren(MenuIdClass, Page.MainFrame, True);
foreach (MenuControl in Page.GetClassChildren_Result) { foreach (MenuControl in Page.GetClassChildren_Result) {
if (!MenuControl.HasClass(\"" . self::CLASS_MENU . "\")) continue; if (!MenuControl.HasClass(\"" . self::CLASS_MENU . "\")) continue;
if (MenuControlId != MenuControl.ControlId) { MenuControl.Visible = (MenuControlId == MenuControl.ControlId);
MenuControl.Hide();
} else {
MenuControl.Show();
}
} }
}"; }";
$menuLabels = Builder::getLabelImplementationBlock(self::LABEL_MOUSECLICK, $mouseClickScript); $menuLabels = Builder::getLabelImplementationBlock(self::LABEL_MOUSECLICK, $mouseClickScript);
@ -543,11 +542,7 @@ if (Event.Control.HasClass(\"" . self::CLASS_PAGER . "\")) {
PageNumber = TextLib::ToInteger(TextLib::SubText(ControlClass, {$pagesNumberPrefixLength}, 99)); PageNumber = TextLib::ToInteger(TextLib::SubText(ControlClass, {$pagesNumberPrefixLength}, 99));
break; break;
} }
if (PageNumber != FML_PageNumber[PagesId]) { PageControl.Visible = (PageNumber == FML_PageNumber[PagesId]);
PageControl.Hide();
} else {
PageControl.Show();
}
} }
Page.GetClassChildren(\"" . self::CLASS_PAGELABEL . "\", Page.MainFrame, True); Page.GetClassChildren(\"" . self::CLASS_PAGELABEL . "\", Page.MainFrame, True);
foreach (PageControl in Page.GetClassChildren_Result) { foreach (PageControl in Page.GetClassChildren_Result) {