Merge remote-tracking branch 'refs/remotes/GarageGames/development' into ColorPickerAdvanced

This commit is contained in:
Anis A. Hireche 2016-02-26 20:15:33 +01:00
commit 2ff18cfc3f
629 changed files with 33887 additions and 3352 deletions

View file

@ -36,6 +36,3 @@ exec("./guiObjectInspector.ed.cs");
exec("./uvEditor.ed.gui");
exec("./objectSelection.ed.cs");
exec("./guiPlatformGenericMenubar.ed.cs");
if (isDemo())
exec("./messageBoxOKBuy.ed.gui");

View file

@ -5,8 +5,8 @@
new GuiPlatformGenericMenuBar()
{
internalName = "menubar";
extent = "1024 32";
minExtent = "320 32";
extent = "1024 20";
minExtent = "320 20";
horizSizing = "width";
profile = "GuiMenuBarProfile";
};

View file

@ -1,85 +0,0 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxOKBuyDlg) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";
position = "0 0";
extent = "640 480";
minExtent = "8 8";
visible = "1";
helpTag = "0";
new GuiWindowCtrl(MBOKBuyFrame) {
profile = "ToolsGuiWindowProfile";
horizSizing = "center";
vertSizing = "center";
position = "170 175";
extent = "300 100";
minExtent = "48 92";
visible = "1";
helpTag = "0";
maxLength = "255";
resizeWidth = "1";
resizeHeight = "1";
canMove = "1";
canClose = "1";
canMinimize = "0";
canMaximize = "0";
minSize = "50 50";
text = "";
closeCommand = "MessageCallback(MessageBoxOKBuyDlg,MessageBoxOKBuyDlg.noCallback);";
new GuiMLTextCtrl(MBOKBuyText) {
profile = "ToolsGuiMLTextProfile";
horizSizing = "center";
vertSizing = "bottom";
position = "11 38";
extent = "280 14";
minExtent = "8 8";
visible = "1";
helpTag = "0";
lineSpacing = "2";
allowColorChars = "0";
maxChars = "-1";
};
new GuiButtonCtrl() {
profile = "ToolsGuiButtonProfile";
horizSizing = "right";
vertSizing = "top";
position = "70 68";
extent = "80 22";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxOKBuyDlg,MessageBoxOKBuyDlg.OKCallback);";
accelerator = "return";
helpTag = "0";
text = "OK";
simpleStyle = "0";
};
new GuiButtonCtrl() {
profile = "ToolsGuiButtonProfile";
horizSizing = "right";
vertSizing = "top";
position = "167 68";
extent = "80 22";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxOKBuyDlg,MessageBoxOKBuyDlg.BuyCallback);";
accelerator = "escape";
helpTag = "0";
text = "Buy Now!";
simpleStyle = "0";
};
};
};
//--- OBJECT WRITE END ---
function MessageBoxOKBuy(%title, %message, %OKCallback, %BuyCallback)
{
MBOKBuyFrame.text = %title;
MessageBoxOKBuyDlg.profile = "ToolsGuiOverlayProfile";
Canvas.pushDialog(MessageBoxOKBuyDlg);
MBSetText(MBOKBuyText, MBOKBuyFrame, %message);
MessageBoxOKBuyDlg.OKCallback = %OKCallback;
MessageBoxOKBuyDlg.BuyCallback = %BuyCallback;
}

View file

@ -1067,8 +1067,10 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile )
singleton GuiControlProfile( GuiMenuBarProfile )
{
fillcolor = "255 255 255";
borderColor = "0 0 0";
border = 1;
fillcolorHL = "213 231 248";
borderColor = "98 163 229";
borderColorHL = "122 177 232";
border = 0;
borderThickness = 1;
opaque = true;
mouseOverSelected = true;