diff --git a/src/compilers/FormatProperties.ts b/src/compilers/FormatProperties.ts index 69c990d..2a866df 100644 --- a/src/compilers/FormatProperties.ts +++ b/src/compilers/FormatProperties.ts @@ -43,6 +43,11 @@ export function FormatProperties(properties: any) { delete properties.anchor } + if (properties.fit_to_width) { + properties["$fit_to_width"] = properties.fit_to_width + delete properties.fit_to_width + } + if (Object.keys(property_bag).length) { if (properties.property_bag) { properties.property_bag = { ...property_bag, ...properties.property_bag } diff --git a/src/types/enums/TextureFileSystem.ts b/src/types/enums/TextureFileSystem.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/types/properties/components.ts b/src/types/properties/components.ts index e71489c..bc71b9f 100644 --- a/src/types/properties/components.ts +++ b/src/types/properties/components.ts @@ -16,7 +16,7 @@ export interface TooltipTrigger extends InputPanel, e.TooltipTrigger {} export interface Button extends InputPanel, e.Button {} export interface Toggle extends InputPanel, e.Toggle {} -export interface Dropdown extends Toggle, e.DropdownName {} +export interface Dropdown extends Toggle, e.Dropdown {} export interface SelectionWheel extends InputPanel, e.SelectionWheel {} export interface EditBox extends Button, e.EditBox {} diff --git a/src/types/properties/element/Control.ts b/src/types/properties/element/Control.ts index 5520f7d..7446451 100644 --- a/src/types/properties/element/Control.ts +++ b/src/types/properties/element/Control.ts @@ -5,13 +5,13 @@ export interface Control { ignored?: Value enabled?: Value layer?: Value - z_order?: Value alpha?: AnimValue propagate_alpha?: Value clips_children?: Value allow_clipping?: Value clip_offset?: Value> clip_state_change_event?: Value + enable_scissor_test?: Value selected?: Value use_child_anchors?: Value contained?: Value @@ -20,6 +20,9 @@ export interface Control { property_bag?: Value collection_index?: Value property_bag_for_children?: Value + disable_anim_fast_forward?: Value + animation_reset_name?: Value + grid_position?: Value> [key: Binding]: Value [key: Variable]: Value } diff --git a/src/types/properties/element/DropdownName.ts b/src/types/properties/element/Dropdown.ts similarity index 81% rename from src/types/properties/element/DropdownName.ts rename to src/types/properties/element/Dropdown.ts index 06b82ab..679b425 100644 --- a/src/types/properties/element/DropdownName.ts +++ b/src/types/properties/element/Dropdown.ts @@ -1,6 +1,6 @@ import { Value } from "../value.js" -export interface DropdownName { +export interface Dropdown { dropdown_name?: Value dropdown_content_control?: Value dropdown_area?: Value diff --git a/src/types/properties/element/Layout.ts b/src/types/properties/element/Layout.ts index 782a3a3..6c4dfc5 100644 --- a/src/types/properties/element/Layout.ts +++ b/src/types/properties/element/Layout.ts @@ -12,4 +12,7 @@ export interface Layout { anchor_from?: Value anchor_to?: Value anchor?: Value + contained?: Value + draggable?: Value + follows_cursor?: Value } diff --git a/src/types/properties/element/ScrollView.ts b/src/types/properties/element/ScrollView.ts index a63f41e..3e77d19 100644 --- a/src/types/properties/element/ScrollView.ts +++ b/src/types/properties/element/ScrollView.ts @@ -4,7 +4,7 @@ export interface ScrollView { scrollbar_track_button?: Value scrollbar_touch_button?: Value scroll_speed?: Value - gesture_control_enabled?: Value + gesture_control_enabled?: Value always_handle_scrolling?: Value touch_mode?: Value scrollbar_box?: Value diff --git a/src/types/properties/element/Slider.ts b/src/types/properties/element/Slider.ts index c0a9c99..ebff85b 100644 --- a/src/types/properties/element/Slider.ts +++ b/src/types/properties/element/Slider.ts @@ -22,10 +22,4 @@ export interface Slider { background_hover_control?: Value progress_control?: Value progress_hover_control?: Value - slider_render_bar_background_color?: Value> - slider_render_bar_progress_color?: Value> - slider_render_bar_outline_color?: Value> - slider_render_bar_background_hover_color?: Value> - slider_render_bar_progress_hover_color?: Value> - slider_render_bar_outline_hover_color?: Value> } diff --git a/src/types/properties/element/Sprite.ts b/src/types/properties/element/Sprite.ts index 21d9b7f..7dccd95 100644 --- a/src/types/properties/element/Sprite.ts +++ b/src/types/properties/element/Sprite.ts @@ -1,4 +1,5 @@ import { ClipDirection } from "../../enums/ClipDirection.js" +import { TextureFileSystem } from "../enum.js" import { AnimValue, Array2, Array3, Array4, Value } from "../value.js" export interface Sprite { @@ -6,9 +7,9 @@ export interface Sprite { allow_debug_missing_texture?: Value uv?: AnimValue> uv_size?: AnimValue> - texture_file_system?: Value + texture_file_system?: Value nineslice_size?: AnimValue | Array3 | Array4> - tiled?: Value + tiled?: Value tiled_scale?: Value> clip_direction?: Value clip_ratio?: Value @@ -22,5 +23,4 @@ export interface Sprite { grayscale?: Value force_texture_reload?: Value base_size?: Value> - color_corrected?: Value } diff --git a/src/types/properties/element/index.ts b/src/types/properties/element/index.ts index 7870f4d..a419539 100644 --- a/src/types/properties/element/index.ts +++ b/src/types/properties/element/index.ts @@ -6,7 +6,7 @@ export * from "./Control.js" export * from "./CustomRenderer.js" export * from "./Cycler.js" export * from "./DataBinding.js" -export * from "./DropdownName.js" +export * from "./Dropdown.js" export * from "./EditBox.js" export * from "./Factory.js" export * from "./Focus.js" diff --git a/src/types/properties/enum.ts b/src/types/properties/enum.ts new file mode 100644 index 0000000..e96f42c --- /dev/null +++ b/src/types/properties/enum.ts @@ -0,0 +1,13 @@ +export enum TextureFileSystem { + IN_USER_PACKAGE = "InUserPackage", + IN_APP_PACKAGE = "InAppPackage", + RAW_PATH = "RawPath", + RAW_PERSISTENT = "RawPersistent", + IN_SETTINGS_DIR = "InSettingsDir", + IN_EXTERNAL_DIR = "InExternalDir", + IN_SERVER_PACKAGE = "InServerPackage", + IN_DATA_DIR = "InDataDir", + IN_USER_DIR = "InUserDir", + IN_WORLD_DIR = "InWorldDir", + STORE_CACHE = "StoreCache", +} diff --git a/src/types/properties/index.ts b/src/types/properties/index.ts index 6c10ba5..62e2f71 100644 --- a/src/types/properties/index.ts +++ b/src/types/properties/index.ts @@ -1,6 +1,7 @@ export * as ElementProperties from "./element/index.js" export * as ComponentProperties from "./components.js" export * as Value from "./value.js" +export * from "./enum.js" export { ArrayName } from "../enums/ArrayName.js" export { Operation } from "../enums/Operation.js"