[DE] Load theme colors after opening the right panel
This commit is contained in:
parent
e9bf021e17
commit
9933dd3a0c
|
@ -1857,7 +1857,6 @@ define([
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
me.getApplication().getController('RightMenu').fillTextArt();
|
me.getApplication().getController('RightMenu').fillTextArt();
|
||||||
}, 50);
|
}, 50);
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
updateThemeColors: function() {
|
updateThemeColors: function() {
|
||||||
|
@ -1865,10 +1864,6 @@ define([
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
me.getApplication().getController('RightMenu').UpdateThemeColors();
|
me.getApplication().getController('RightMenu').UpdateThemeColors();
|
||||||
}, 50);
|
}, 50);
|
||||||
setTimeout(function(){
|
|
||||||
me.getApplication().getController('DocumentHolder').getView().updateThemeColors();
|
|
||||||
}, 50);
|
|
||||||
|
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
me.getApplication().getController('Toolbar').updateThemeColors();
|
me.getApplication().getController('Toolbar').updateThemeColors();
|
||||||
}, 50);
|
}, 50);
|
||||||
|
|
|
@ -276,7 +276,7 @@ define([
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.editMode && this.api) {
|
if (this.editMode && this.api) {
|
||||||
this.rightmenu.shapeSettings.createDelayedElements();
|
// this.rightmenu.shapeSettings.createDelayedElements();
|
||||||
var selectedElements = this.api.getSelectedElements();
|
var selectedElements = this.api.getSelectedElements();
|
||||||
if (selectedElements.length>0) {
|
if (selectedElements.length>0) {
|
||||||
this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu));
|
this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu));
|
||||||
|
|
|
@ -1838,11 +1838,6 @@ define([
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
updateThemeColors: function() {
|
|
||||||
this.effectcolors = Common.Utils.ThemeColor.getEffectColors();
|
|
||||||
this.standartcolors = Common.Utils.ThemeColor.getStandartColors();
|
|
||||||
},
|
|
||||||
|
|
||||||
onCutCopyPaste: function(item, e) {
|
onCutCopyPaste: function(item, e) {
|
||||||
var me = this;
|
var me = this;
|
||||||
if (me.api) {
|
if (me.api) {
|
||||||
|
|
|
@ -393,9 +393,9 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
createDelayedElements: function() {
|
createDelayedElements: function() {
|
||||||
|
this._initSettings = false;
|
||||||
this.UpdateThemeColors();
|
this.UpdateThemeColors();
|
||||||
this.updateMetricUnit();
|
this.updateMetricUnit();
|
||||||
this._initSettings = false;
|
|
||||||
},
|
},
|
||||||
|
|
||||||
openAdvancedSettings: function(e) {
|
openAdvancedSettings: function(e) {
|
||||||
|
|
|
@ -1482,6 +1482,7 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
createDelayedElements: function() {
|
createDelayedElements: function() {
|
||||||
|
this._initSettings = false;
|
||||||
this.createDelayedControls();
|
this.createDelayedControls();
|
||||||
|
|
||||||
var global_hatch_menu_map = [
|
var global_hatch_menu_map = [
|
||||||
|
@ -1517,7 +1518,6 @@ define([
|
||||||
|
|
||||||
this.onApiAutoShapes();
|
this.onApiAutoShapes();
|
||||||
this.UpdateThemeColors();
|
this.UpdateThemeColors();
|
||||||
this._initSettings = false;
|
|
||||||
},
|
},
|
||||||
|
|
||||||
onInitStandartTextures: function(texture) {
|
onInitStandartTextures: function(texture) {
|
||||||
|
@ -1670,6 +1670,8 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
UpdateThemeColors: function() {
|
UpdateThemeColors: function() {
|
||||||
|
if (this._initSettings) return;
|
||||||
|
|
||||||
if (!this.btnBackColor) {
|
if (!this.btnBackColor) {
|
||||||
// create color buttons
|
// create color buttons
|
||||||
this.btnBackColor = new Common.UI.ColorButton({
|
this.btnBackColor = new Common.UI.ColorButton({
|
||||||
|
@ -1691,7 +1693,6 @@ define([
|
||||||
});
|
});
|
||||||
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
|
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
|
||||||
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
|
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
|
||||||
|
|
||||||
this.btnFGColor = new Common.UI.ColorButton({
|
this.btnFGColor = new Common.UI.ColorButton({
|
||||||
style: "width:45px;",
|
style: "width:45px;",
|
||||||
menu : new Common.UI.Menu({
|
menu : new Common.UI.Menu({
|
||||||
|
@ -1768,7 +1769,6 @@ define([
|
||||||
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
|
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
|
||||||
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
|
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
|
||||||
}
|
}
|
||||||
|
|
||||||
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
|
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
|
||||||
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
|
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
|
||||||
this.colorsFG.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
|
this.colorsFG.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
|
||||||
|
|
|
@ -431,10 +431,10 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
createDelayedElements: function() {
|
createDelayedElements: function() {
|
||||||
|
this._initSettings = false;
|
||||||
this.createDelayedControls();
|
this.createDelayedControls();
|
||||||
this.UpdateThemeColors();
|
this.UpdateThemeColors();
|
||||||
this.updateMetricUnit();
|
this.updateMetricUnit();
|
||||||
this._initSettings = false;
|
|
||||||
},
|
},
|
||||||
|
|
||||||
ChangeSettings: function(props) {
|
ChangeSettings: function(props) {
|
||||||
|
@ -641,6 +641,7 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
UpdateThemeColors: function() {
|
UpdateThemeColors: function() {
|
||||||
|
if (this._initSettings) return;
|
||||||
if (!this.btnBackColor) {
|
if (!this.btnBackColor) {
|
||||||
// create color buttons
|
// create color buttons
|
||||||
this.btnBorderColor = new Common.UI.ColorButton({
|
this.btnBorderColor = new Common.UI.ColorButton({
|
||||||
|
|
|
@ -1075,6 +1075,7 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
UpdateThemeColors: function() {
|
UpdateThemeColors: function() {
|
||||||
|
if (this._initSettings) return;
|
||||||
if (!this.btnBackColor) {
|
if (!this.btnBackColor) {
|
||||||
this.btnBorderColor = new Common.UI.ColorButton({
|
this.btnBorderColor = new Common.UI.ColorButton({
|
||||||
style: "width:45px;",
|
style: "width:45px;",
|
||||||
|
|
Loading…
Reference in a new issue