diff --git a/CHANGELOG.md b/CHANGELOG.md index 081ed653f..98b199111 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. - [#1826] (Optional) Extending shape area by half pixel to fix antialias conflation artifacts (Can be turned on in advanced settings) - Icons for Simple editor library folders +- [#2448] Simple editor - Option to turn off half transparent parent layers ### Fixed - [#2424] DefineEditText handling of letterSpacing, font size on incorrect values @@ -3731,6 +3732,7 @@ Major version of SWF to XML export changed to 2. [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 [#2427]: https://www.free-decompiler.com/flash/issues/2427 [#1826]: https://www.free-decompiler.com/flash/issues/1826 +[#2448]: https://www.free-decompiler.com/flash/issues/2448 [#2424]: https://www.free-decompiler.com/flash/issues/2424 [#2391]: https://www.free-decompiler.com/flash/issues/2391 [#2436]: https://www.free-decompiler.com/flash/issues/2436 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java index 7c800c36c..f8706347f 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java @@ -1049,6 +1049,10 @@ public final class Configuration { @ConfigurationDirectory public static ConfigurationItem lastSolEditorDirectory = null; + @ConfigurationDefaultBoolean(true) + @ConfigurationCategory("display") + public static ConfigurationItem halfTransparentParentLayersEasy = null; + private enum OSId { WINDOWS, OSX, UNIX } diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java index 5c0fb13bf..8f539b3d4 100644 --- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java +++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java @@ -3268,9 +3268,11 @@ public final class ImagePanel extends JPanel implements MediaDisplay { DepthState parentDepthState = parentTimelineds.get(i).getTimeline().getDepthState(parentFrames.get(i), parentDepths.get(i)); ignoreDepths.add(parentDepthState.depth); - parentTimelined.getTimeline().toImage(parentFrames.get(i), 0, new RenderContext(), image, image, false, + if (Configuration.halfTransparentParentLayersEasy.get()) { + parentTimelined.getTimeline().toImage(parentFrames.get(i), 0, new RenderContext(), image, image, false, parentMatrix.preConcatenate(m), new Matrix(), parentMatrix.preConcatenate(m), null, zoom, true, viewRect, parentMatrix.preConcatenate(m), true, Timeline.DRAW_MODE_ALL, 0, !Configuration.disableBitmapSmoothing.get(), ignoreDepths); + } parentMatrix = parentMatrix.concatenate(new Matrix(parentDepthState.matrix)); ignoreDepths.clear(); } diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties index a02073035..ae0f02f64 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties @@ -551,4 +551,8 @@ config.description.maxScriptLineLength = Maximum line length in the script edito #after 21.1.3 config.name.lastSolEditorDirectory = Last Sol editor directory -config.description.lastSolEditorDirectory = Directory where last SOL file was opened/saved \ No newline at end of file +config.description.lastSolEditorDirectory = Directory where last SOL file was opened/saved + +#after 22.0.2 +config.name.halfTransparentParentLayersEasy = Half transparent parent layers in Simple editor +config.description.halfTransparentParentLayersEasy = Shows parent layers when editing subMovieClips as half transparent. False = do not show parent layers at all. diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties index 407c98523..775c3618c 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties @@ -529,3 +529,28 @@ config.description.warningAddFunction = Zobrazovat varov\u00e1n\u00ed p\u0159ed #after 21.0.2 config.name.linkAllClasses = P\u0159idat vazbu na v\u0161echny t\u0159\u00eddy (zvuky, p\u00edsma, obr\u00e1zky) config.description.linkAllClasses = P\u0159id\u00e1 speci\u00e1ln\u00ed skript kter\u00fd odkazuje na v\u0161echny t\u0159\u00eddy (zvuky, p\u00edsma, obr\u00e1zky) v SWF souboru. Tohle je u\u017eite\u010dn\u00e9 pokud \u017e\u00e1dn\u00fd jin\u00fd skript na n\u011b neodkazuje, aby byly st\u00e1le sou\u010d\u00e1st\u00ed zkompilovan\u00e9ho souboru. + +#after 21.1.0 +config.name.recentColors = Posledn\u00ed barvy +config.description.recentColors = Posledn\u00ed barvy v dialogu barev + +#after 21.1.1 +config.name.gui.splitPaneEasyVertical.dividerLocationPercent = (Internal) Jednoduch\u00e9 UI vertik\u00e1ln\u00ed um\u00edst\u011bn\u00ed rozd\u011blovn\u00edku +config.description.gui.splitPaneEasyVertical.dividerLocationPercent = + +config.name.gui.splitPaneEasyHorizontal.dividerLocationPercent = (Internal) Jednoduch\u00e9 UI horizont\u00e1ln\u00ed um\u00edst\u011bn\u00ed rozd\u011blovn\u00edku +config.description.gui.splitPaneEasyHorizontal.dividerLocationPercent = + +config.name.lastSessionEasySwf = Posledn\u00ed soubor ze sezen\u00ed Jednoduch\u00e9ho editoru +config.description.lastSessionEasySwf = Obsahuje vybran\u00e9 SWF z posledn\u00edho sezen\u00ed v Jednoduch\u00e9m editoru + +config.name.maxScriptLineLength = Maxim\u00e1ln\u00ed d\u00e9lka \u0159\u00e1dku skriptu +config.description.maxScriptLineLength = Maxim\u00e1ln\u00ed d\u00e9lka \u0159\u00e1dku v editoru skriptu p\u0159ed t\u00edm ne\u017e bude zalomen. 0 = neomezen\u011b. Na linuxu mohou b\u00fdt probl\u00e9my se zobrazen\u00edm velmi dlouh\u00e9 \u0159\u00e1dky, proto je to ve v\u00fdchoz\u00edm nastaven\u00ed omezen\u00e9. + +#after 21.1.3 +config.name.lastSolEditorDirectory = Posledn\u00ed slo\u017eka Sol editoru +config.description.lastSolEditorDirectory = Adres\u00e1\u0159, kde byl posledn\u00ed SOL soubor otev\u0159en/ulo\u017een + +#after 22.0.2 +config.name.halfTransparentParentLayersEasy = Pr\u016fsvitn\u00e9 nad\u0159azen\u00e9 vrstvy v Simple editoru +config.description.halfTransparentParentLayersEasy = Zobraz\u00ed nad\u0159azen\u00e9 vrstvy p\u0159i editaci animovan\u00fdch podklip\u016f pr\u016fsvitn\u011b. Vypnuto = nezobraz\u00ed nad\u0159azen\u00e9 vrstvy v\u016fbec.