Merge pull request #902 from vvv-yeaf/development

Editor GUI Update pt.2
This commit is contained in:
Brian Roberts 2022-09-20 20:48:17 -05:00 committed by GitHub
commit 21479e80e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 79 additions and 70 deletions

View file

@ -5,10 +5,10 @@ $guiContent = new GuiControl(ConsoleDlg) {
minExtent = "8 8";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
profile = "GuiConsoleProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
tooltipProfile = "GuiConsoleProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
@ -38,7 +38,7 @@ $guiContent = new GuiControl(ConsoleDlg) {
visible = "1";
active = "1";
altCommand = "ConsoleEntry::eval();";
tooltipProfile = "GuiToolTipProfile";
tooltipProfile = "GuiConsoleProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
@ -67,7 +67,7 @@ $guiContent = new GuiControl(ConsoleDlg) {
new GuiBitmapCtrl() {
bitmapAsset = "Core_GUI:hudFill";
color = "255 255 255 255";
color = "40 40 40 255";
wrap = "0";
position = "0 0";
extent = "1024 22";
@ -146,7 +146,7 @@ $guiContent = new GuiControl(ConsoleDlg) {
snap = "0";
value = "0.65";
useFillBar = "0";
fillBarColor = "255 255 255 255";
fillBarColor = "40 40 40 255";
renderTicks = "1";
position = "361 4";
extent = "106 14";
@ -187,7 +187,7 @@ $guiContent = new GuiControl(ConsoleDlg) {
profile = "ConsoleScrollProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
tooltipProfile = "GuiConsoleProfile";
hovertime = "1000";
isContainer = "1";
internalName = "Scroll";
@ -203,7 +203,7 @@ $guiContent = new GuiControl(ConsoleDlg) {
profile = "GuiConsoleProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
tooltipProfile = "GuiConsoleProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
@ -211,4 +211,4 @@ $guiContent = new GuiControl(ConsoleDlg) {
};
};
};
//--- OBJECT WRITE END ---
//--- OBJECT WRITE END ---

View file

@ -22,12 +22,14 @@
if(!isObject(GuiConsoleProfile))
new GuiControlProfile(GuiConsoleProfile)
{
{
border = true;
borderColor = "15 15 15";
fontType = ($platform $= "macos") ? "Monaco" : "Lucida Console";
fontSize = ($platform $= "macos") ? 13 : 12;
fontColor = "255 255 255";
fontColorHL = "0 255 255";
fontColorNA = "255 0 0";
fontSize = ($platform $= "macos") ? 14 : 13;
fontColor = "225 225 225";
fontColorHL = "165 214 255";
fontColorNA = "255 65 65";
fontColors[6] = "100 100 100";
fontColors[7] = "100 100 0";
fontColors[8] = "0 0 100";
@ -50,7 +52,7 @@ new GuiControlProfile(GuiConsoleTextProfile)
category = "Core";
};
$ConsoleDefaultFillColor = "0 0 0 175";
$ConsoleDefaultFillColor = "12 14 19 175";
if(!isObject(ConsoleScrollProfile))
new GuiControlProfile(ConsoleScrollProfile : GuiScrollProfile)
@ -66,7 +68,12 @@ new GuiControlProfile(ConsoleScrollProfile : GuiScrollProfile)
if(!isObject(ConsoleTextEditProfile))
new GuiControlProfile(ConsoleTextEditProfile : GuiTextEditProfile)
{
fillColor = "242 241 240 255";
fillColorHL = "255 255 255";
opaque = true;
border =false;
fontType = "Arial";
fontSize = 16;
fontColor = "255 255 255";
fillColorHL = "30 30 30 255";
cursorColor = "255 255 255";
category = "Core";
};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

View file

@ -57,7 +57,7 @@ new GuiControlProfile (GuiDefaultProfile)
borderColorNA = "75 75 75";
// font
fontType = "Noto Sans";
fontType = "Arial";
fontSize = 14;
fontCharset = ANSI;
@ -97,7 +97,7 @@ new GuiControlProfile (GuiToolTipProfile)
borderColor = "87 87 87";
// font
fontType = "Noto Sans";
fontType = "Arial";
fontSize = 14;
fontColor = "200 200 200";
@ -185,9 +185,10 @@ new GuiControlProfile(GuiCheckBoxProfile)
border = false;
borderColor = "100 100 100";
fontSize = 14;
fontColor = "20 20 20";
fontType = "Arial";
fontColor = "215 215 215";
fontColorHL = "80 80 80";
fontColorNA = "200 200 200";
fontColorNA = "200 200 200";
fixedExtent = true;
justify = "left";
bitmapAsset = "Core_GUI:checkbox_image";
@ -218,7 +219,7 @@ if( !isObject( GuiProgressTextProfile ) )
new GuiControlProfile( GuiProgressTextProfile )
{
fontSize = "14";
fontType = "Noto Sans";
fontType = "Arial";
fontColor = "0 0 0";
justify = "center";
category = "Core";