From 88765013b68c9257634c624a3ab000b63202c0f7 Mon Sep 17 00:00:00 2001 From: Pawel Pastuszak Date: Sat, 28 Jul 2018 12:46:02 +0200 Subject: [PATCH] Release VisUI 1.4.1 --- build-editor.gradle | 2 +- build.gradle | 2 +- ui/CHANGES.md | 2 + ui/build.gradle | 2 +- .../main/java/com/kotcrab/vis/ui/VisUI.java | 2 +- ...sui-1.4.1-SNAPSHOT.usl => visui-1.4.1.usl} | 0 usl/styles/visui-1.4.2-SNAPSHOT.usl | 294 ++++++++++++++++++ 7 files changed, 300 insertions(+), 4 deletions(-) rename usl/styles/{visui-1.4.1-SNAPSHOT.usl => visui-1.4.1.usl} (100%) create mode 100644 usl/styles/visui-1.4.2-SNAPSHOT.usl diff --git a/build-editor.gradle b/build-editor.gradle index ae341909d..f386ce765 100644 --- a/build-editor.gradle +++ b/build-editor.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3" - classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3" + classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0" classpath "com.kotcrab.vis:vis-usl:0.2.1" classpath "com.badlogicgames.gdx:gdx-tools:1.9.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" diff --git a/build.gradle b/build.gradle index b2b4ffd13..524508798 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { classpath "com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3" - classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3" + classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0" classpath "com.kotcrab.vis:vis-usl:0.2.1" classpath "com.badlogicgames.gdx:gdx-tools:1.9.2" } diff --git a/ui/CHANGES.md b/ui/CHANGES.md index 10b3746fa..eb4584c32 100644 --- a/ui/CHANGES.md +++ b/ui/CHANGES.md @@ -1,3 +1,5 @@ +#### Version: 1.4.2 + #### Version: 1.4.1 (LibGDX 1.9.8) - **Fixed**: `FileChooser`'s icon provider not working correctly when chooser's selection checkboxes were enabled - **Fixed**: [#292](https://github.com/kotcrab/vis-editor/issues/292) removing `Menu` from `MenuBar` causes `IllegalStateException` diff --git a/ui/build.gradle b/ui/build.gradle index 695e5be87..4524f889f 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -1,5 +1,5 @@ group = 'com.kotcrab.vis' -version = '1.4.1-SNAPSHOT' +version = '1.4.2-SNAPSHOT' apply plugin: "java" apply plugin: 'maven' diff --git a/ui/src/main/java/com/kotcrab/vis/ui/VisUI.java b/ui/src/main/java/com/kotcrab/vis/ui/VisUI.java index 8042fef99..1ce0cb2f8 100644 --- a/ui/src/main/java/com/kotcrab/vis/ui/VisUI.java +++ b/ui/src/main/java/com/kotcrab/vis/ui/VisUI.java @@ -31,7 +31,7 @@ */ public class VisUI { /** Current VisUI version, does not include SNAPSHOT even if this version is snapshot. */ - public static final String VERSION = "1.4.1"; + public static final String VERSION = "1.4.2"; private static final String TARGET_GDX_VERSION = "1.9.8"; private static boolean skipGdxVersionCheck = false; diff --git a/usl/styles/visui-1.4.1-SNAPSHOT.usl b/usl/styles/visui-1.4.1.usl similarity index 100% rename from usl/styles/visui-1.4.1-SNAPSHOT.usl rename to usl/styles/visui-1.4.1.usl diff --git a/usl/styles/visui-1.4.2-SNAPSHOT.usl b/usl/styles/visui-1.4.2-SNAPSHOT.usl new file mode 100644 index 000000000..ebe8278c4 --- /dev/null +++ b/usl/styles/visui-1.4.2-SNAPSHOT.usl @@ -0,0 +1,294 @@ +//VisUI 1.4.2 style + +#com.badlogic.gdx.graphics.g2d.BitmapFont: { + default-font: { file: default.fnt } + small-font: { file: font-small.fnt } +} + +#com.badlogic.gdx.graphics.Color: { + black: { a: 1, b: 0, g: 0, r: 0 } + white: { a: 1, b: 1, g: 1, r: 1 } + green: { a: 1, b: 0, g: 1, r: 0 } + red: { a: 1, b: 0, g: 0, r: 1 } + blue: { a: 1, b: 1, g: 0, r: 0 } + grey: { a: 1, b: 0.32, g: 0.32, r: 0.32 } + vis-blue: { a: 1, b: 0.886, g: 0.631, r: 0.105 } + vis-red: { a: 1, b: 0.047, g: 0, r: 0.862 } + + menuitem: { a: 1, b: 0.65, g: 0.65, r: 0.65 } + link-label: { a: 1, b: 0.886, g: 0.631, r: 0.105 } +} + +.font: { font: default-font, fontColor: white, } +.font-disabled: { disabledFontColor: grey } + +.font-small: { font: small-font, fontColor: white } +.font-small-disabled: { disabledFontColor: grey } + +.focus-border: { focusBorder: border } +.focus-border-dark-blue: { focusBorder: border-dark-blue } +.focus-border-circle: { focusBorder: border-circle } +.error-border: { errorBorder: border-error } +.error-border-circle: { errorBorder: border-circle-error } + +package com.badlogic.gdx.scenes.scene2d.ui { + #Skin$TintedDrawable: { + dialogDim: { name: white, color: { r: 0, g: 0, b: 0, a: 0.45 } } + } + + #Button$ButtonStyle: { + default: { down: button-down, up: button } + blue: { down: button-blue-down, up: button-blue } + toggle inherits default: { checked: button-down } + } + + #TextButton$TextButtonStyle extends ButtonStyle: { + default inherits .font, .font-disabled: { over: button-over, disabled: button } + blue inherits .font, .font-disabled: { over: button-blue-over, disabled: button } + toggle inherits default, .font: {} + } + + //all styles inherited without any change required + #ImageButton$ImageButtonStyle extends ButtonStyle: { + } + + //all styles inherited without any change required + #ImageTextButton$ImageTextButtonStyle extends TextButtonStyle: { + } + + #ScrollPane$ScrollPaneStyle: { + list: { vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal } + default inherits list: { background: border } + } + + #SelectBox$SelectBoxStyle: { + default inherits .font, .font-disabled: { + background: default-select, + scrollStyle: default, + listStyle: { font: default-font, selection: padded-list-selection, background: select-box-list-bg } + } + } + + #SplitPane$SplitPaneStyle: { + default-vertical: { handle: splitpane-vertical } + default-horizontal: { handle: splitpane } + } + + #Window$WindowStyle: { + default: { titleFont: default-font, background: window, titleFontColor: white } + resizable inherits default: { background: window-resizable } + noborder inherits default: { background: window-noborder } + dialog inherits default: { stageBackground: dialogDim } + } + + #ProgressBar$ProgressBarStyle: { + default-horizontal: { background: progressbar, knob: progressbar-filled, knobBefore: progressbar-filled} + default-vertical: { background: progressbar-vertical, knob: progressbar-filled-vertical, knobBefore: progressbar-filled-vertical } + } + + #Slider$SliderStyle: { + -base: { knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down, disabledKnob: slider-knob-disabled} + default-horizontal inherits base: { background: slider } + default-vertical inherits base: { background: slider-vertical } + } + + #Label$LabelStyle: { + default inherits .font: { } + link-label inherits default: { fontColor: link-label } + small inherits .font-small: { } + menuitem-shortcut: { font: default-font, fontColor: menuitem } + } + + #TextField$TextFieldStyle: { + -base: { selection: selection, background: textfield, cursor: cursor, messageFont: default-font, messageFontColor: grey } + default inherits .font, .font-disabled, base: { } + small inherits .font-small, .font-small-disabled, base: { } + } + + #CheckBox$CheckBoxStyle: { + default inherits .font, .font-disabled: { checkboxOn: check-on, checkboxOff: check-off } + radio inherits .font, .font-disabled: { checkboxOn: radio-on, checkboxOff: radio-off } + } + + #List$ListStyle: { default: { fontColorUnselected: white, selection: padded-list-selection, fontColorSelected: white, font: default-font } } + #Touchpad$TouchpadStyle: { default: { background: default-pane, knob: touchpad-knob } } + #Tree$TreeStyle: { default: { minus: tree-minus, plus: tree-plus, selection: tree-selection, over: tree-over } } + + #TextTooltip$TextTooltipStyle: { + default: { + background: default-pane, + label inherits .font: { } + } + } +} + +#com.kotcrab.vis.ui.Sizes: { + default: { + scaleFactor: 1, + + spacingBottom: 8, + spacingRight: 6, + + buttonBarSpacing: 10, + + menuItemIconSize: 22, + + borderSize: 1, + + spinnerButtonHeight: 12, + spinnerFieldSize: 40, + + fileChooserViewModeBigIconsSize: 200, + fileChooserViewModeMediumIconsSize: 128, + fileChooserViewModeSmallIconsSize: 64, + fileChooserViewModeListWidthSize: 155, + } + + x2 inherits default: { + scaleFactor: 2, + + menuItemIconSize: 44, + + spinnerButtonHeight: 24, + spinnerFieldSize: 80, + } +} + +package com.kotcrab.vis.ui.widget { + #VisTextField$VisTextFieldStyle: { + -base: { selection: selection, background: textfield, backgroundOver: textfield-over, cursor: cursor } + default inherits .focus-border, .error-border, .font, .font-disabled, base: { } + textArea inherits default: { backgroundOver: NULL, focusBorder: NULL } + small inherits .focus-border, .error-border, .font-small, .font-small-disabled, base: { } + label inherits .error-border, .font, .font-disabled: { selection: selection } + } + + #VisTextButton$VisTextButtonStyle extends TextButtonStyle: { + default inherits .focus-border: {} + toggle inherits .focus-border: {} + blue inherits .focus-border-dark-blue: {} + menu-bar inherits default, .font: { over: button-down, focusBorder: NULL } + } + + #VisImageButton$VisImageButtonStyle: { + default inherits .focus-border: { down: button-down, up: button, over: button-over, disabled: button } + blue inherits .focus-border-dark-blue: { down: button-blue-down, up: button-blue, over: button-blue-over, disabled: button-blue } + toggle inherits default, .focus-border: { checked: button-down } + close: { down: button-red, up: button, over: button-over, imageUp: icon-close, disabled: button } + close-active-tab inherits blue: { down: button-red, imageUp: icon-close, focusBorder: NULL } + close-window inherits close: { up: button-window-bg } + close-titlebar inherits close: { imageUp: icon-close-titlebar } + } + + #VisImageTextButton$VisImageTextButtonStyle extends VisTextButtonStyle: { + default: { } + toggle: { } + blue: { } + default-noborder inherits default: { focusBorder: NULL } + toggle-noborder inherits toggle: { focusBorder: NULL } + } + + #VisCheckBox$VisCheckBoxStyle: { + default inherits .focus-border, .error-border, .font, .font-disabled: + { checkBackground: vis-check, checkBackgroundOver: vis-check-over, checkBackgroundDown: vis-check-down, tick: vis-check-tick, tickDisabled: vis-check-tick-disabled } + radio inherits .focus-border-circle, .error-border-circle, .font, .font-disabled: + { checkBackground: vis-radio, checkBackgroundOver: vis-radio-over, checkBackgroundDown: vis-radio-down, tick: vis-radio-tick, tickDisabled: vis-radio-tick-disabled } + } + + #PopupMenu$PopupMenuStyle: { + noborder: { background: button } + default inherits noborder: { background: button, border: border } + } + + #Menu$MenuStyle extends PopupMenuStyle: { + -base: { openButtonStyle: menu-bar } + default inherits base: {} + noborder inherits base: {} + } + + #MenuBar$MenuBarStyle: { + default: { background: menu-bg } + } + + #Separator$SeparatorStyle: { + default: {background: separator, thickness: 4} + menu: {background: separator-menu, thickness: 3} + } + + #VisSplitPane$VisSplitPaneStyle: { + default-vertical: { handle: splitpane-vertical, handleOver: splitpane-vertical-over } + default-horizontal: { handle: splitpane, handleOver: splitpane-over } + } + + #MultiSplitPane$MultiSplitPaneStyle extends VisSplitPaneStyle: { + } + + #MenuItem$MenuItemStyle extends TextButtonStyle: { + default: { subMenu: sub-menu } + } + + #Tooltip$TooltipStyle: { + default: { background: tooltip-bg } + } + + #LinkLabel$LinkLabelStyle: { + default inherits .font: { fontColor: link-label, underline: white } + } + + #tabbedpane.TabbedPane$TabbedPaneStyle: { + default: { background: menu-bg, separatorBar: list-selection, vertical: false, + buttonStyle inherits .font, .font-disabled: { down: button-down, up: button, checked: button-down, over: button-over, disabled: button } } + vertical inherits default: { vertical: true } + } + + #spinner.Spinner$SpinnerStyle: { + default: { down: select-down, up: select-up } + } + + #file.FileChooserStyle: { + default: { highlight: list-selection, popupMenuStyle: "default", iconArrowLeft: icon-arrow-left, iconArrowRight: icon-arrow-right, + iconFolder: icon-folder, iconFolderParent: icon-folder-parent, iconFolderNew: icon-folder-new, iconDrive: icon-drive, + iconFolderStar: icon-folder-star, iconTrash: icon-trash, iconStar: icon-star, iconStarOutline: icon-star-outline, iconRefresh: icon-refresh + iconFileText: icon-file-text, iconFileImage: icon-file-image, iconFilePdf: icon-file-pdf, iconFileAudio: icon-file-audio + iconListSettings: icon-list-settings, + contextMenuSelectedItem: vis-radio-tick, expandDropdown: select-down } + } + + #color.ColorPickerWidgetStyle: { + default: { barSelector: color-picker-bar-selector, cross: color-picker-cross, iconArrowRight: icon-arrow-right + verticalSelector: color-picker-selector-vertical, horizontalSelector: color-picker-selector-horizontal } + } + + #color.ColorPickerStyle extends ~WindowStyle: { + default: { pickerStyle: { barSelector: color-picker-bar-selector, cross: color-picker-cross, iconArrowRight: icon-arrow-right + verticalSelector: color-picker-selector-vertical, horizontalSelector: color-picker-selector-horizontal }} + } + + #toast.Toast$ToastStyle: { + default: { background: tooltip-bg, closeButtonStyle: close } + dark: { background: window-border-bg, closeButtonStyle: close-window } + } + + #BusyBar$BusyBarStyle: { + -base: { segment: vis-blue, segmentWidth: 100, segmentOverflow: 50 } + default inherits base: { height: 2 } + slim inherits base: { height: 1 } + thick inherits base: { height: 6 } + } + + #ListViewStyle: { + default: { scrollPaneStyle: list } + } +} + +package com.kotcrab.vis.ui.util { + #form.SimpleFormValidator$FormValidatorStyle: { + default: { errorLabelColor: vis-red, validLabelColor: white } + smooth inherits default: { colorTransitionDuration: 0.3 } + } + + #adapter.SimpleListAdapter$SimpleListAdapterStyle: { + default: { background: window-bg, selection: list-selection } + } +} +