igniteui-angular-inputs 21.0.0 → 21.0.1

package/esm2015/lib/ButtonGroupView_combined.js

@@ -6,18 +6,22 @@ GOVERNS THE LICENSING, INSTALLATION AND USE OF INFRAGISTICS SOFTWARE. BY DOWNLOA
 */
 import { Base, Delegate_$type, fromEnum, runOn, markType, INotifyPropertyChanged_$type, PropertyChangedEventArgs, delegateCombine, enumGetBox, delegateRemove, fromEn } from "igniteui-angular-core";
 import { List$1 } from "igniteui-angular-core";
+import { XButton } from "./XButton";
 import { ButtonGroupOrientation_$type } from "./ButtonGroupOrientation";
 import { ButtonGroupDisplayStyle_$type } from "./ButtonGroupDisplayStyle";
 import { BaseControlTheme_$type } from "igniteui-angular-core";
 import { ControlDisplayDensity_$type } from "igniteui-angular-core";
 import { XButtonGroupButtonCollection } from "./XButtonGroupButtonCollection";
 import { ThemeResolver } from "./ThemeResolver";
-import { ButtonGroupSelectionChangedEventArgs } from "./ButtonGroupSelectionChangedEventArgs";
+import { ButtonDisplayStyle_$type } from "./ButtonDisplayStyle";
 import { CornerRadius } from "igniteui-angular-core";
+import { ButtonGroupSelectionChangedEventArgs } from "./ButtonGroupSelectionChangedEventArgs";
 import { ButtonGroupVisualModelExport } from "./ButtonGroupVisualModelExport";
 import { AppearanceHelper } from "igniteui-angular-core";
 import { ButtonVisualModelExport } from "./ButtonVisualModelExport";
 import { BrushUtil } from "igniteui-angular-core";
+import { Dictionary$2 } from "igniteui-angular-core";
+import { Theme } from "./Theme";
 import { isNaN_ } from "igniteui-angular-core";
 /**
  * @hidden
@@ -90,7 +94,7 @@ export let ButtonGroupView = /*@__PURE__*/ (() => {
                     comp_.flexDirection = 'column';
                 }
             }, true);
-            this.a.db();
+            this.a.dc();
         }
         z(a) {
             if (this.m != a) {
@@ -138,14 +142,14 @@ export let ButtonGroupView = /*@__PURE__*/ (() => {
         }
         x(a) {
             if (this.a.k == 0) {
-                a.f0 = "flex";
-                a.g4 = "row";
-                a.fb = "center";
+                a.f1 = "flex";
+                a.g5 = "row";
+                a.fc = "center";
             }
             else {
-                a.f0 = "flex";
-                a.g4 = "column";
-                a.fb = "stretch";
+                a.f1 = "flex";
+                a.g5 = "column";
+                a.fc = "stretch";
             }
         }
         o(a) {
@@ -163,101 +167,101 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
         constructor() {
             super();
             this.h = 1;
-            this.n = 0;
+            this.o = 0;
+            this.s = 1;
             this.r = 1;
-            this.q = 1;
             this.a = new Array(0);
-            this.u = false;
+            this.v = false;
             this._view = null;
-            this.ax = ThemeResolver.m(XButtonGroup.o, XButtonGroup.av, XButtonGroup.ap);
-            this.gz = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gn, XButtonGroup.fn);
-            this.g1 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gp, XButtonGroup.fp);
-            this.g0 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.go, XButtonGroup.fo);
-            this.g2 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gq, XButtonGroup.fq);
-            this.aw = ThemeResolver.m(XButtonGroup.o, XButtonGroup.au, XButtonGroup.ao);
-            this.g6 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gu, XButtonGroup.fu);
-            this.g3 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gr, XButtonGroup.fr);
-            this.g7 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gv, XButtonGroup.fv);
-            this.ha = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gy, XButtonGroup.fy);
-            this.g4 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gs, XButtonGroup.fs);
-            this.g5 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gt, XButtonGroup.ft);
-            this.g8 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gw, XButtonGroup.fw);
-            this.g9 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gx, XButtonGroup.fx);
-            this.ar = ThemeResolver.m(XButtonGroup.o, XButtonGroup.at, XButtonGroup.an);
-            this.fz = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gb, XButtonGroup.fb);
-            this.f1 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gd, XButtonGroup.fd);
-            this.f0 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gc, XButtonGroup.fc);
-            this.f2 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.ge, XButtonGroup.fe);
-            this.aq = ThemeResolver.m(XButtonGroup.o, XButtonGroup.as, XButtonGroup.am);
-            this.f6 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gi, XButtonGroup.fi);
-            this.f3 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gf, XButtonGroup.ff);
-            this.f7 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gj, XButtonGroup.fj);
-            this.ga = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gm, XButtonGroup.fm);
-            this.f4 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gg, XButtonGroup.fg);
-            this.f5 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gh, XButtonGroup.fh);
-            this.f8 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gk, XButtonGroup.fk);
-            this.f9 = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gl, XButtonGroup.fl);
-            this.ad = ThemeResolver.m(XButtonGroup.o, XButtonGroup.av, XButtonGroup.ap);
-            this.dm = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gn, XButtonGroup.fn);
-            this.dp = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gp, XButtonGroup.fp);
-            this.du = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gu, XButtonGroup.fu);
-            this.dr = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gr, XButtonGroup.fr);
-            this.dn = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.go, XButtonGroup.fo);
-            this.dq = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gq, XButtonGroup.fq);
-            this.ac = ThemeResolver.m(XButtonGroup.o, XButtonGroup.au, XButtonGroup.ao);
-            this.dv = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gv, XButtonGroup.fv);
-            this.dy = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gy, XButtonGroup.fy);
-            this.ds = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gs, XButtonGroup.fs);
-            this.dt = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gt, XButtonGroup.ft);
-            this.dw = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gw, XButtonGroup.fw);
-            this.dx = ThemeResolver.ah(XButtonGroup.o, XButtonGroup.gx, XButtonGroup.fx);
-            this.ah = NaN;
-            this.d7 = null;
-            this.d9 = null;
-            this.ee = null;
-            this.eb = null;
-            this.ec = null;
+            this.ay = XButtonGroup.n.y(XButtonGroup.p, 1, enumGetBox(ButtonDisplayStyle_$type, 2), "CornerRadius").d;
+            this.g0 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "BackgroundColor");
+            this.g2 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBackgroundColor");
+            this.g1 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderColor");
+            this.g3 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBorderColor");
+            this.ax = XButtonGroup.n.i(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderWidth");
+            this.g7 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "TextColor");
+            this.g4 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledTextColor");
+            this.g8 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "SelectedBackgroundColor");
+            this.hb = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "SelectedTextColor");
+            this.g5 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverBackgroundColor");
+            this.g6 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverTextColor");
+            this.g9 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverSelectedBackgroundColor");
+            this.ha = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverSelectedTextColor");
+            this.as = XButtonGroup.n.y(XButtonGroup.p, 1, enumGetBox(ButtonDisplayStyle_$type, 1), "CornerRadius").d;
+            this.f0 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "BackgroundColor");
+            this.f2 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBackgroundColor");
+            this.f1 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderColor");
+            this.f3 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBorderColor");
+            this.ar = XButtonGroup.n.i(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderWidth");
+            this.f7 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "TextColor");
+            this.f4 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledTextColor");
+            this.f8 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "SelectedBackgroundColor");
+            this.gb = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "SelectedTextColor");
+            this.f5 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverBackgroundColor");
+            this.f6 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverTextColor");
+            this.f9 = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverSelectedBackgroundColor");
+            this.ga = XButtonGroup.n.af(XButtonGroup.p, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverSelectedTextColor");
+            this.ae = ThemeResolver.m(XButtonGroup.p, XButtonGroup.aw, XButtonGroup.aq);
+            this.dn = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.go, XButtonGroup.fo);
+            this.dq = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gq, XButtonGroup.fq);
+            this.dv = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gv, XButtonGroup.fv);
+            this.ds = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gs, XButtonGroup.fs);
+            this.dp = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gp, XButtonGroup.fp);
+            this.dr = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gr, XButtonGroup.fr);
+            this.ad = ThemeResolver.m(XButtonGroup.p, XButtonGroup.av, XButtonGroup.ap);
+            this.dw = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gw, XButtonGroup.fw);
+            this.dz = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gz, XButtonGroup.fz);
+            this.dt = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gt, XButtonGroup.ft);
+            this.du = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gu, XButtonGroup.fu);
+            this.dx = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gx, XButtonGroup.fx);
+            this.dy = ThemeResolver.aj(XButtonGroup.p, XButtonGroup.gy, XButtonGroup.fy);
+            this.ai = NaN;
             this.d8 = null;
             this.ea = null;
-            this.ag = NaN;
+            this.ef = null;
+            this.ec = null;
             this.ed = null;
-            this.ev = null;
-            this.ey = null;
+            this.d9 = null;
+            this.eb = null;
+            this.ah = NaN;
+            this.ee = null;
             this.ew = null;
+            this.ez = null;
             this.ex = null;
-            this.aj = NaN;
-            this.ef = null;
-            this.eh = null;
-            this.em = null;
-            this.ej = null;
-            this.ek = null;
+            this.ey = null;
+            this.ak = NaN;
             this.eg = null;
             this.ei = null;
-            this.ai = NaN;
+            this.en = null;
+            this.ek = null;
             this.el = null;
-            this.er = null;
-            this.eu = null;
+            this.eh = null;
+            this.ej = null;
+            this.aj = NaN;
+            this.em = null;
             this.es = null;
+            this.ev = null;
             this.et = null;
-            this.af = NaN;
-            this.dz = null;
-            this.d1 = null;
-            this.d6 = null;
-            this.d3 = null;
-            this.d4 = null;
+            this.eu = null;
+            this.ag = NaN;
             this.d0 = null;
             this.d2 = null;
-            this.ae = NaN;
+            this.d7 = null;
+            this.d4 = null;
             this.d5 = null;
-            this.en = null;
-            this.eq = null;
+            this.d1 = null;
+            this.d3 = null;
+            this.af = NaN;
+            this.d6 = null;
             this.eo = null;
+            this.er = null;
             this.ep = null;
+            this.eq = null;
             this.j = 0;
-            this.a6 = "ig-buttongroup-" + XButtonGroup.a4++;
-            this.w = false;
-            this.v = false;
+            this.a7 = "ig-buttongroup-" + XButtonGroup.a5++;
             this.x = false;
+            this.w = false;
+            this.y = false;
             this.propertyChanged = null;
             this.f = new XButtonGroupButtonCollection();
             this.selectionChanged = null;
@@ -266,9 +270,9 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             this.view = a;
             this.view.v();
             let b = this.f;
-            b.collectionChanged = delegateCombine(b.collectionChanged, runOn(this, this.c3));
+            b.collectionChanged = delegateCombine(b.collectionChanged, runOn(this, this.c4));
             let c = this.f;
-            c.collectionResetting = delegateCombine(c.collectionResetting, runOn(this, this.c4));
+            c.collectionResetting = delegateCombine(c.collectionResetting, runOn(this, this.c5));
         }
         get i() {
             return this.h;
@@ -277,35 +281,35 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.h;
             this.h = a;
             if (b != this.h) {
-                this.da("DisplayType", enumGetBox(ButtonGroupDisplayStyle_$type, b), enumGetBox(ButtonGroupDisplayStyle_$type, a));
+                this.db("DisplayType", enumGetBox(ButtonGroupDisplayStyle_$type, b), enumGetBox(ButtonGroupDisplayStyle_$type, a));
             }
         }
-        get p() {
-            return this.n;
+        get q() {
+            return this.o;
         }
-        set p(a) {
-            let b = this.n;
-            this.n = a;
-            if (b != this.n) {
-                this.da("BaseTheme", enumGetBox(BaseControlTheme_$type, b), enumGetBox(BaseControlTheme_$type, a));
+        set q(a) {
+            let b = this.o;
+            this.o = a;
+            if (b != this.o) {
+                this.db("BaseTheme", enumGetBox(BaseControlTheme_$type, b), enumGetBox(BaseControlTheme_$type, a));
             }
         }
-        c4(a, b) {
+        c5(a, b) {
             for (let c of fromEnum(this.buttons)) {
-                c.clicked = delegateRemove(c.clicked, runOn(this, this.c6));
+                c.clicked = delegateRemove(c.clicked, runOn(this, this.c7));
             }
-            this.df();
+            this.dg();
             this.view.q();
         }
         appendContentChild(a) {
             this.view.o(a);
         }
-        c3(a, b) {
+        c4(a, b) {
             if (b.oldItems != null) {
                 for (let c of fromEn(b.oldItems)) {
                     let d = c;
                     if (d != null) {
-                        d.clicked = delegateRemove(d.clicked, runOn(this, this.c6));
+                        d.clicked = delegateRemove(d.clicked, runOn(this, this.c7));
                     }
                     this.view.r(d);
                 }
@@ -314,17 +318,27 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
                 for (let e of fromEn(b.newItems)) {
                     let f = e;
                     if (f != null) {
-                        f.clicked = delegateCombine(f.clicked, runOn(this, this.c6));
+                        f.clicked = delegateCombine(f.clicked, runOn(this, this.c7));
                     }
                     this.view.p(f);
                 }
             }
-            this.df();
+            this.dg();
         }
-        c6(a, b) {
+        c7(a, b) {
             let c = a;
             let d = this.buttons.indexOf(c);
-            this.de(c, d);
+            this.df(c, d);
+        }
+        get u() {
+            return this.s;
+        }
+        set u(a) {
+            let b = this.s;
+            this.s = a;
+            if (b != this.s) {
+                this.db("Density", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, a));
+            }
         }
         get t() {
             return this.r;
@@ -333,17 +347,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.r;
             this.r = a;
             if (b != this.r) {
-                this.da("Density", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, a));
-            }
-        }
-        get s() {
-            return this.q;
-        }
-        set s(a) {
-            let b = this.q;
-            this.q = a;
-            if (b != this.q) {
-                this.da("ActualDensity", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, a));
+                this.db("ActualDensity", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, a));
             }
         }
         get d() {
@@ -353,22 +357,22 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.a;
             this.a = a;
             if (b != this.a) {
-                this.da("SelectedIndices", b, a);
+                this.db("SelectedIndices", b, a);
             }
         }
-        de(a, b) {
-            this.u = true;
-            if (this.aa(a)) {
+        df(a, b) {
+            this.v = true;
+            if (this.ab(a)) {
                 this.d = this.b(this.d, a, b);
             }
             else {
-                if (!this.z) {
+                if (!this.aa) {
                     this.d = new Array(0);
                 }
                 this.d = this.c(this.d, a, b);
             }
-            this.df();
-            this.u = false;
+            this.dg();
+            this.v = false;
             if (this.selectionChanged != null) {
                 this.selectionChanged(this, new ButtonGroupSelectionChangedEventArgs());
             }
@@ -405,17 +409,17 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
         destroy() {
             this.provideContainer(null);
         }
-        da(a, b, c) {
+        db(a, b, c) {
             if (this.propertyChanged != null) {
                 this.propertyChanged(this, new PropertyChangedEventArgs(a));
             }
-            this.dc(a, b, c);
+            this.dd(a, b, c);
         }
-        dc(a, b, c) {
+        dd(a, b, c) {
             switch (a) {
                 case "BaseTheme":
-                    this.dh(this.p);
-                    this.dg();
+                    this.di(this.q);
+                    this.dh();
                     break;
                 case "DisplayType":
                 case "ItemBorderColor":
@@ -439,7 +443,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
                 case "OutlinedItemDisabledTextColor":
                 case "OutlinedSelectedItemTextColor":
                 case "OutlinedItemHoverBackgroundColor":
-                case XButtonGroup.cv:
+                case XButtonGroup.cw:
                 case "OutlinedItemHoverTextColor":
                 case "OutlinedSelectedItemHoverTextColor":
                 case "FlatItemBorderColor":
@@ -454,7 +458,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
                 case "FlatSelectedItemHoverBackgroundColor":
                 case "FlatItemHoverTextColor":
                 case "FlatSelectedItemHoverTextColor":
-                    this.dg();
+                    this.dh();
                     break;
                 case "ActualItemBorderColor":
                 case "ActualItemDisabledBorderColor":
@@ -464,18 +468,18 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
                 case "ActualItemDisabledTextColor":
                 case "ActualSelectedItemTextColor":
                 case "ActualSelectedItemBackgroundColor":
-                    this.df();
+                    this.dg();
                     break;
                 case "Orientation":
                     this.view.y();
-                    this.df();
+                    this.dg();
                     break;
                 case "Density":
-                    this.s = this.t == 0 ? 1 : this.t;
+                    this.t = this.u == 0 ? 1 : this.u;
                     break;
                 case "ActualDensity":
                     for (let d = 0; d < this.buttons.count; d++) {
-                        this.buttons._inner[d].r = this.s;
+                        this.buttons._inner[d].s = this.t;
                     }
                     break;
                 case "IsDisabled":
@@ -484,90 +488,90 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
                     }
                     break;
                 case "SelectedIndices":
-                    if (!this.u) {
-                        this.df();
+                    if (!this.v) {
+                        this.dg();
                     }
                     break;
             }
         }
-        dl(a, b) {
+        dm(a, b) {
             return new CornerRadius(1, !isNaN_(a.d) ? a.d : b.d, !isNaN_(a.e) ? a.e : b.e, !isNaN_(a.c) ? a.c : b.c, !isNaN_(a.b) ? a.b : b.b);
         }
-        dg() {
+        dh() {
             switch (this.i) {
                 case 1:
-                    this.al = !isNaN_(this.a1) ? this.a1 : this.ax;
-                    this.ez = this.hn != null ? this.hn : this.gz;
-                    this.e1 = this.hp != null ? this.hp : this.g1;
-                    this.e6 = this.hu != null ? this.hu : this.g6;
-                    this.e3 = this.hr != null ? this.hr : this.g3;
+                    this.am = !isNaN_(this.a2) ? this.a2 : this.ay;
                     this.e0 = this.ho != null ? this.ho : this.g0;
                     this.e2 = this.hq != null ? this.hq : this.g2;
-                    this.ak = !isNaN_(this.a0) ? this.a0 : this.aw;
-                    this.e7 = this.h7 != null ? this.h7 : this.g7;
-                    this.fa = this.ia != null ? this.ia : this.ha;
+                    this.e7 = this.hv != null ? this.hv : this.g7;
                     this.e4 = this.hs != null ? this.hs : this.g4;
-                    this.e5 = this.ht != null ? this.ht : this.g5;
+                    this.e1 = this.hp != null ? this.hp : this.g1;
+                    this.e3 = this.hr != null ? this.hr : this.g3;
+                    this.al = !isNaN_(this.a1) ? this.a1 : this.ax;
                     this.e8 = this.h8 != null ? this.h8 : this.g8;
+                    this.fb = this.ib != null ? this.ib : this.hb;
+                    this.e5 = this.ht != null ? this.ht : this.g5;
+                    this.e6 = this.hu != null ? this.hu : this.g6;
                     this.e9 = this.h9 != null ? this.h9 : this.g9;
+                    this.fa = this.ia != null ? this.ia : this.ha;
                     break;
                 case 0:
-                    this.al = !isNaN_(this.a1) ? this.a1 : this.ar;
-                    this.ez = this.hn != null ? this.hn : this.fz;
-                    this.e1 = this.hp != null ? this.hp : this.f1;
-                    this.e6 = this.hu != null ? this.hu : this.f6;
-                    this.e3 = this.hr != null ? this.hr : this.f3;
+                    this.am = !isNaN_(this.a2) ? this.a2 : this.as;
                     this.e0 = this.ho != null ? this.ho : this.f0;
                     this.e2 = this.hq != null ? this.hq : this.f2;
-                    this.ak = !isNaN_(this.a0) ? this.a0 : this.aq;
-                    this.e7 = this.h7 != null ? this.h7 : this.f7;
-                    this.fa = this.ia != null ? this.ia : this.ga;
+                    this.e7 = this.hv != null ? this.hv : this.f7;
                     this.e4 = this.hs != null ? this.hs : this.f4;
-                    this.e5 = this.ht != null ? this.ht : this.f5;
+                    this.e1 = this.hp != null ? this.hp : this.f1;
+                    this.e3 = this.hr != null ? this.hr : this.f3;
+                    this.al = !isNaN_(this.a1) ? this.a1 : this.ar;
                     this.e8 = this.h8 != null ? this.h8 : this.f8;
+                    this.fb = this.ib != null ? this.ib : this.gb;
+                    this.e5 = this.ht != null ? this.ht : this.f5;
+                    this.e6 = this.hu != null ? this.hu : this.f6;
                     this.e9 = this.h9 != null ? this.h9 : this.f9;
+                    this.fa = this.ia != null ? this.ia : this.ga;
                     break;
             }
         }
-        df() {
+        dg() {
             for (let a = 0; a < this.buttons.count; a++) {
                 let b = this.buttons._inner[a];
-                b.r = this.s;
+                b.s = this.t;
                 if (a == 0) {
-                    this.di(b);
+                    this.dj(b);
                 }
                 else if (a == this.buttons.count - 1) {
-                    this.dj(b);
+                    this.dk(b);
                 }
                 else {
-                    this.dk(b);
+                    this.dl(b);
                 }
                 b.e = 1;
-                b.a2 = false;
-                if (this.v) {
+                b.a3 = false;
+                if (this.w) {
                     b.disabled = this.disabled;
                 }
-                b.n2 = this.e0;
-                b.bk = this.ak;
-                b.pq = this.e2;
-                b.pp = this.e1;
-                b.pr = this.e3;
+                b.n7 = this.e1;
+                b.bl = this.al;
+                b.pv = this.e3;
+                b.pu = this.e2;
+                b.pw = this.e4;
                 this.view.x(b);
-                if (this.aa(b)) {
-                    b.n1 = this.e7;
-                    b.rg = this.fa;
-                    b.qg = this.e8;
-                    b.qh = this.e9;
+                if (this.ab(b)) {
+                    b.n6 = this.e8;
+                    b.rl = this.fb;
+                    b.ql = this.e9;
+                    b.qm = this.fa;
                 }
                 else {
-                    b.n1 = this.ez;
-                    b.rg = this.e6;
-                    b.qg = this.e4;
-                    b.qh = this.e5;
+                    b.n6 = this.e0;
+                    b.rl = this.e7;
+                    b.ql = this.e5;
+                    b.qm = this.e6;
                 }
             }
         }
-        aa(a) {
+        ab(a) {
             let b = this.buttons.indexOf(a);
             for (let c = 0; c < this.d.length; c++) {
                 if (this.d[c] == b) {
@@ -576,103 +580,63 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        dk(a) {
-            a.k1 = new CornerRadius(1, 0, 0, 0, 0);
+        dl(a) {
+            a.k6 = new CornerRadius(1, 0, 0, 0, 0);
         }
-        dj(a) {
+        dk(a) {
             if (this.k == 1) {
-                a.k1 = new CornerRadius(1, 0, 0, this.al, this.al);
+                a.k6 = new CornerRadius(1, 0, 0, this.am, this.am);
             }
             else {
-                a.k1 = new CornerRadius(1, 0, this.al, this.al, 0);
+                a.k6 = new CornerRadius(1, 0, this.am, this.am, 0);
             }
         }
-        di(a) {
+        dj(a) {
             if (this.k == 1) {
-                a.k1 = new CornerRadius(1, this.al, this.al, 0, 0);
+                a.k6 = new CornerRadius(1, this.am, this.am, 0, 0);
             }
             else {
-                a.k1 = new CornerRadius(1, this.al, 0, 0, this.al);
-            }
-        }
-        dh(a) {
-            this.ax = ThemeResolver.m(a, XButtonGroup.av, XButtonGroup.ap);
-            this.gz = ThemeResolver.ah(a, XButtonGroup.gn, XButtonGroup.fn);
-            this.g1 = ThemeResolver.ah(a, XButtonGroup.gp, XButtonGroup.fp);
-            this.g0 = ThemeResolver.ah(a, XButtonGroup.go, XButtonGroup.fo);
-            this.g2 = ThemeResolver.ah(a, XButtonGroup.gq, XButtonGroup.fq);
-            this.aw = ThemeResolver.m(a, XButtonGroup.au, XButtonGroup.ao);
-            this.g6 = ThemeResolver.ah(a, XButtonGroup.gu, XButtonGroup.fu);
-            this.g3 = ThemeResolver.ah(a, XButtonGroup.gr, XButtonGroup.fr);
-            this.g7 = ThemeResolver.ah(a, XButtonGroup.gv, XButtonGroup.fv);
-            this.ha = ThemeResolver.ah(a, XButtonGroup.gy, XButtonGroup.fy);
-            this.g4 = ThemeResolver.ah(a, XButtonGroup.gs, XButtonGroup.fs);
-            this.g5 = ThemeResolver.ah(a, XButtonGroup.gt, XButtonGroup.ft);
-            this.g8 = ThemeResolver.ah(a, XButtonGroup.gw, XButtonGroup.fw);
-            this.g9 = ThemeResolver.ah(a, XButtonGroup.gx, XButtonGroup.fx);
-            this.ar = ThemeResolver.m(a, XButtonGroup.at, XButtonGroup.an);
-            this.fz = ThemeResolver.ah(a, XButtonGroup.gb, XButtonGroup.fb);
-            this.f1 = ThemeResolver.ah(a, XButtonGroup.gd, XButtonGroup.fd);
-            this.f0 = ThemeResolver.ah(a, XButtonGroup.gc, XButtonGroup.fc);
-            this.f2 = ThemeResolver.ah(a, XButtonGroup.ge, XButtonGroup.fe);
-            this.aq = ThemeResolver.m(a, XButtonGroup.as, XButtonGroup.am);
-            this.f6 = ThemeResolver.ah(a, XButtonGroup.gi, XButtonGroup.fi);
-            this.f3 = ThemeResolver.ah(a, XButtonGroup.gf, XButtonGroup.ff);
-            this.f7 = ThemeResolver.ah(a, XButtonGroup.gj, XButtonGroup.fj);
-            this.ga = ThemeResolver.ah(a, XButtonGroup.gm, XButtonGroup.fm);
-            this.f4 = ThemeResolver.ah(a, XButtonGroup.gg, XButtonGroup.fg);
-            this.f5 = ThemeResolver.ah(a, XButtonGroup.gh, XButtonGroup.fh);
-            this.f8 = ThemeResolver.ah(a, XButtonGroup.gk, XButtonGroup.fk);
-            this.f9 = ThemeResolver.ah(a, XButtonGroup.gl, XButtonGroup.fl);
-        }
-        get al() {
-            return this.ad;
-        }
-        set al(a) {
-            let b = this.ad;
-            this.ad = a;
-            if (b != this.ad) {
-                this.da("ActualItemCornerRadius", b, a);
-            }
-        }
-        get ez() {
-            return this.dm;
-        }
-        set ez(a) {
-            let b = this.dm;
-            this.dm = a;
-            if (b != this.dm) {
-                this.da("ActualItemBackgroundColor", b, a);
-            }
-        }
-        get e1() {
-            return this.dp;
-        }
-        set e1(a) {
-            let b = this.dp;
-            this.dp = a;
-            if (b != this.dp) {
-                this.da("ActualItemDisabledBackgroundColor", b, a);
-            }
-        }
-        get e6() {
-            return this.du;
-        }
-        set e6(a) {
-            let b = this.du;
-            this.du = a;
-            if (b != this.du) {
-                this.da("ActualItemTextColor", b, a);
+                a.k6 = new CornerRadius(1, this.am, 0, 0, this.am);
             }
         }
-        get e3() {
-            return this.dr;
+        di(a) {
+            this.ay = XButtonGroup.n.y(a, this.r, enumGetBox(ButtonDisplayStyle_$type, 2), "CornerRadius").d;
+            this.g0 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "BackgroundColor");
+            this.g2 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBackgroundColor");
+            this.g1 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderColor");
+            this.g3 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBorderColor");
+            this.ax = XButtonGroup.n.i(a, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderWidth");
+            this.g7 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "TextColor");
+            this.g4 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledTextColor");
+            this.g8 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "SelectedBackgroundColor");
+            this.hb = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "SelectedTextColor");
+            this.g5 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverBackgroundColor");
+            this.g6 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverTextColor");
+            this.g9 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverSelectedBackgroundColor");
+            this.ha = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverSelectedTextColor");
+            this.as = XButtonGroup.n.y(a, this.r, enumGetBox(ButtonDisplayStyle_$type, 1), "CornerRadius").d;
+            this.f0 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "BackgroundColor");
+            this.f2 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBackgroundColor");
+            this.f1 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderColor");
+            this.f3 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBorderColor");
+            this.ar = XButtonGroup.n.i(a, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderWidth");
+            this.f7 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "TextColor");
+            this.f4 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledTextColor");
+            this.f8 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "SelectedBackgroundColor");
+            this.gb = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "SelectedTextColor");
+            this.f5 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverBackgroundColor");
+            this.f6 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverTextColor");
+            this.f9 = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverSelectedBackgroundColor");
+            this.ga = XButtonGroup.n.af(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverSelectedTextColor");
+        }
+        get am() {
+            return this.ae;
         }
-        set e3(a) {
-            let b = this.dr;
-            this.dr = a;
-            if (b != this.dr) {
-                this.da("ActualItemDisabledTextColor", b, a);
+        set am(a) {
+            let b = this.ae;
+            this.ae = a;
+            if (b != this.ae) {
+                this.db("ActualItemCornerRadius", b, a);
             }
         }
         get e0() {
@@ -682,7 +646,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.dn;
             this.dn = a;
             if (b != this.dn) {
-                this.da("ActualItemBorderColor", b, a);
+                this.db("ActualItemBackgroundColor", b, a);
             }
         }
         get e2() {
@@ -692,17 +656,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.dq;
             this.dq = a;
             if (b != this.dq) {
-                this.da("ActualItemDisabledBorderColor", b, a);
-            }
-        }
-        get ak() {
-            return this.ac;
-        }
-        set ak(a) {
-            let b = this.ac;
-            this.ac = a;
-            if (b != this.ac) {
-                this.da("ActualItemBorderWidth", b, a);
+                this.db("ActualItemDisabledBackgroundColor", b, a);
             }
         }
         get e7() {
@@ -712,17 +666,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.dv;
             this.dv = a;
             if (b != this.dv) {
-                this.da("ActualSelectedItemBackgroundColor", b, a);
-            }
-        }
-        get fa() {
-            return this.dy;
-        }
-        set fa(a) {
-            let b = this.dy;
-            this.dy = a;
-            if (b != this.dy) {
-                this.da("ActualSelectedItemTextColor", b, a);
+                this.db("ActualItemTextColor", b, a);
             }
         }
         get e4() {
@@ -732,17 +676,37 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.ds;
             this.ds = a;
             if (b != this.ds) {
-                this.da("ActualItemHoverBackgroundColor", b, a);
+                this.db("ActualItemDisabledTextColor", b, a);
             }
         }
-        get e5() {
-            return this.dt;
+        get e1() {
+            return this.dp;
         }
-        set e5(a) {
-            let b = this.dt;
-            this.dt = a;
-            if (b != this.dt) {
-                this.da("ActualItemHoverTextColor", b, a);
+        set e1(a) {
+            let b = this.dp;
+            this.dp = a;
+            if (b != this.dp) {
+                this.db("ActualItemBorderColor", b, a);
+            }
+        }
+        get e3() {
+            return this.dr;
+        }
+        set e3(a) {
+            let b = this.dr;
+            this.dr = a;
+            if (b != this.dr) {
+                this.db("ActualItemDisabledBorderColor", b, a);
+            }
+        }
+        get al() {
+            return this.ad;
+        }
+        set al(a) {
+            let b = this.ad;
+            this.ad = a;
+            if (b != this.ad) {
+                this.db("ActualItemBorderWidth", b, a);
             }
         }
         get e8() {
@@ -752,7 +716,37 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.dw;
             this.dw = a;
             if (b != this.dw) {
-                this.da("ActualSelectedItemHoverBackgroundColor", b, a);
+                this.db("ActualSelectedItemBackgroundColor", b, a);
+            }
+        }
+        get fb() {
+            return this.dz;
+        }
+        set fb(a) {
+            let b = this.dz;
+            this.dz = a;
+            if (b != this.dz) {
+                this.db("ActualSelectedItemTextColor", b, a);
+            }
+        }
+        get e5() {
+            return this.dt;
+        }
+        set e5(a) {
+            let b = this.dt;
+            this.dt = a;
+            if (b != this.dt) {
+                this.db("ActualItemHoverBackgroundColor", b, a);
+            }
+        }
+        get e6() {
+            return this.du;
+        }
+        set e6(a) {
+            let b = this.du;
+            this.du = a;
+            if (b != this.du) {
+                this.db("ActualItemHoverTextColor", b, a);
             }
         }
         get e9() {
@@ -762,57 +756,57 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.dx;
             this.dx = a;
             if (b != this.dx) {
-                this.da("ActualSelectedItemHoverTextColor", b, a);
+                this.db("ActualSelectedItemHoverBackgroundColor", b, a);
             }
         }
-        get a1() {
-            return this.ah;
+        get fa() {
+            return this.dy;
         }
-        set a1(a) {
-            let b = this.ah;
-            this.ah = a;
-            if (b != this.ah) {
-                this.da("ItemCornerRadius", b, a);
+        set fa(a) {
+            let b = this.dy;
+            this.dy = a;
+            if (b != this.dy) {
+                this.db("ActualSelectedItemHoverTextColor", b, a);
             }
         }
-        get hn() {
-            return this.d7;
+        get a2() {
+            return this.ai;
         }
-        set hn(a) {
-            let b = this.d7;
-            this.d7 = a;
-            if (b != this.d7) {
-                this.da("ItemBackgroundColor", b, a);
+        set a2(a) {
+            let b = this.ai;
+            this.ai = a;
+            if (b != this.ai) {
+                this.db("ItemCornerRadius", b, a);
             }
         }
-        get hp() {
-            return this.d9;
+        get ho() {
+            return this.d8;
         }
-        set hp(a) {
-            let b = this.d9;
-            this.d9 = a;
-            if (b != this.d9) {
-                this.da("ItemDisabledBackgroundColor", b, a);
+        set ho(a) {
+            let b = this.d8;
+            this.d8 = a;
+            if (b != this.d8) {
+                this.db("ItemBackgroundColor", b, a);
             }
         }
-        get hu() {
-            return this.ee;
+        get hq() {
+            return this.ea;
         }
-        set hu(a) {
-            let b = this.ee;
-            this.ee = a;
-            if (b != this.ee) {
-                this.da("ItemTextColor", b, a);
+        set hq(a) {
+            let b = this.ea;
+            this.ea = a;
+            if (b != this.ea) {
+                this.db("ItemDisabledBackgroundColor", b, a);
             }
         }
-        get hr() {
-            return this.eb;
+        get hv() {
+            return this.ef;
         }
-        set hr(a) {
-            let b = this.eb;
-            this.eb = a;
-            if (b != this.eb) {
-                this.da("ItemDisabledTextColor", b, a);
+        set hv(a) {
+            let b = this.ef;
+            this.ef = a;
+            if (b != this.ef) {
+                this.db("ItemTextColor", b, a);
             }
         }
         get hs() {
@@ -822,37 +816,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.ec;
             this.ec = a;
             if (b != this.ec) {
-                this.da("ItemHoverBackgroundColor", b, a);
-            }
-        }
-        get ho() {
-            return this.d8;
-        }
-        set ho(a) {
-            let b = this.d8;
-            this.d8 = a;
-            if (b != this.d8) {
-                this.da("ItemBorderColor", b, a);
-            }
-        }
-        get hq() {
-            return this.ea;
-        }
-        set hq(a) {
-            let b = this.ea;
-            this.ea = a;
-            if (b != this.ea) {
-                this.da("ItemDisabledBorderColor", b, a);
-            }
-        }
-        get a0() {
-            return this.ag;
-        }
-        set a0(a) {
-            let b = this.ag;
-            this.ag = a;
-            if (b != this.ag) {
-                this.da("ItemBorderWidth", b, a);
+                this.db("ItemDisabledTextColor", b, a);
             }
         }
         get ht() {
@@ -862,27 +826,47 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.ed;
             this.ed = a;
             if (b != this.ed) {
-                this.da("ItemHoverTextColor", b, a);
+                this.db("ItemHoverBackgroundColor", b, a);
             }
         }
-        get h7() {
-            return this.ev;
+        get hp() {
+            return this.d9;
         }
-        set h7(a) {
-            let b = this.ev;
-            this.ev = a;
-            if (b != this.ev) {
-                this.da("SelectedItemBackgroundColor", b, a);
+        set hp(a) {
+            let b = this.d9;
+            this.d9 = a;
+            if (b != this.d9) {
+                this.db("ItemBorderColor", b, a);
             }
         }
-        get ia() {
-            return this.ey;
+        get hr() {
+            return this.eb;
         }
-        set ia(a) {
-            let b = this.ey;
-            this.ey = a;
-            if (b != this.ey) {
-                this.da("SelectedItemTextColor", b, a);
+        set hr(a) {
+            let b = this.eb;
+            this.eb = a;
+            if (b != this.eb) {
+                this.db("ItemDisabledBorderColor", b, a);
+            }
+        }
+        get a1() {
+            return this.ah;
+        }
+        set a1(a) {
+            let b = this.ah;
+            this.ah = a;
+            if (b != this.ah) {
+                this.db("ItemBorderWidth", b, a);
+            }
+        }
+        get hu() {
+            return this.ee;
+        }
+        set hu(a) {
+            let b = this.ee;
+            this.ee = a;
+            if (b != this.ee) {
+                this.db("ItemHoverTextColor", b, a);
             }
         }
         get h8() {
@@ -892,7 +876,17 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.ew;
             this.ew = a;
             if (b != this.ew) {
-                this.da("SelectedItemHoverBackgroundColor", b, a);
+                this.db("SelectedItemBackgroundColor", b, a);
+            }
+        }
+        get ib() {
+            return this.ez;
+        }
+        set ib(a) {
+            let b = this.ez;
+            this.ez = a;
+            if (b != this.ez) {
+                this.db("SelectedItemTextColor", b, a);
             }
         }
         get h9() {
@@ -902,67 +896,27 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.ex;
             this.ex = a;
             if (b != this.ex) {
-                this.da("SelectedItemHoverTextColor", b, a);
+                this.db("SelectedItemHoverBackgroundColor", b, a);
             }
         }
-        get a3() {
-            return this.aj;
-        }
-        set a3(a) {
-            let b = this.aj;
-            this.aj = a;
-            if (b != this.aj) {
-                this.da("OutlinedItemCornerRadius", b, a);
-            }
-        }
-        get hv() {
-            return this.ef;
-        }
-        set hv(a) {
-            let b = this.ef;
-            this.ef = a;
-            if (b != this.ef) {
-                this.da("OutlinedItemBackgroundColor", b, a);
-            }
-        }
-        get hx() {
-            return this.eh;
-        }
-        set hx(a) {
-            let b = this.eh;
-            this.eh = a;
-            if (b != this.eh) {
-                this.da("OutlinedItemDisabledBackgroundColor", b, a);
-            }
-        }
-        get h2() {
-            return this.em;
-        }
-        set h2(a) {
-            let b = this.em;
-            this.em = a;
-            if (b != this.em) {
-                this.da("OutlinedItemTextColor", b, a);
-            }
-        }
-        get hz() {
-            return this.ej;
+        get ia() {
+            return this.ey;
         }
-        set hz(a) {
-            let b = this.ej;
-            this.ej = a;
-            if (b != this.ej) {
-                this.da("OutlinedItemDisabledTextColor", b, a);
+        set ia(a) {
+            let b = this.ey;
+            this.ey = a;
+            if (b != this.ey) {
+                this.db("SelectedItemHoverTextColor", b, a);
             }
         }
-        get h0() {
-            return this.ek;
+        get a4() {
+            return this.ak;
         }
-        set h0(a) {
-            let b = this.ek;
-            this.ek = a;
-            if (b != this.ek) {
-                this.da("OutlinedItemHoverBackgroundColor", b, a);
+        set a4(a) {
+            let b = this.ak;
+            this.ak = a;
+            if (b != this.ak) {
+                this.db("OutlinedItemCornerRadius", b, a);
             }
         }
         get hw() {
@@ -972,7 +926,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.eg;
             this.eg = a;
             if (b != this.eg) {
-                this.da("OutlinedItemBorderColor", b, a);
+                this.db("OutlinedItemBackgroundColor", b, a);
             }
         }
         get hy() {
@@ -982,17 +936,27 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.ei;
             this.ei = a;
             if (b != this.ei) {
-                this.da("OutlinedItemDisabledBorderColor", b, a);
+                this.db("OutlinedItemDisabledBackgroundColor", b, a);
             }
         }
-        get a2() {
-            return this.ai;
+        get h3() {
+            return this.en;
         }
-        set a2(a) {
-            let b = this.ai;
-            this.ai = a;
-            if (b != this.ai) {
-                this.da("OutlinedItemBorderWidth", b, a);
+        set h3(a) {
+            let b = this.en;
+            this.en = a;
+            if (b != this.en) {
+                this.db("OutlinedItemTextColor", b, a);
+            }
+        }
+        get h0() {
+            return this.ek;
+        }
+        set h0(a) {
+            let b = this.ek;
+            this.ek = a;
+            if (b != this.ek) {
+                this.db("OutlinedItemDisabledTextColor", b, a);
             }
         }
         get h1() {
@@ -1002,27 +966,47 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.el;
             this.el = a;
             if (b != this.el) {
-                this.da("OutlinedItemHoverTextColor", b, a);
+                this.db("OutlinedItemHoverBackgroundColor", b, a);
             }
         }
-        get h3() {
-            return this.er;
+        get hx() {
+            return this.eh;
         }
-        set h3(a) {
-            let b = this.er;
-            this.er = a;
-            if (b != this.er) {
-                this.da("OutlinedSelectedItemBackgroundColor", b, a);
+        set hx(a) {
+            let b = this.eh;
+            this.eh = a;
+            if (b != this.eh) {
+                this.db("OutlinedItemBorderColor", b, a);
             }
         }
-        get h6() {
-            return this.eu;
+        get hz() {
+            return this.ej;
         }
-        set h6(a) {
-            let b = this.eu;
-            this.eu = a;
-            if (b != this.eu) {
-                this.da("OutlinedSelectedItemTextColor", b, a);
+        set hz(a) {
+            let b = this.ej;
+            this.ej = a;
+            if (b != this.ej) {
+                this.db("OutlinedItemDisabledBorderColor", b, a);
+            }
+        }
+        get a3() {
+            return this.aj;
+        }
+        set a3(a) {
+            let b = this.aj;
+            this.aj = a;
+            if (b != this.aj) {
+                this.db("OutlinedItemBorderWidth", b, a);
+            }
+        }
+        get h2() {
+            return this.em;
+        }
+        set h2(a) {
+            let b = this.em;
+            this.em = a;
+            if (b != this.em) {
+                this.db("OutlinedItemHoverTextColor", b, a);
             }
         }
         get h4() {
@@ -1032,7 +1016,17 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.es;
             this.es = a;
             if (b != this.es) {
-                this.da(XButtonGroup.cv, b, a);
+                this.db("OutlinedSelectedItemBackgroundColor", b, a);
+            }
+        }
+        get h7() {
+            return this.ev;
+        }
+        set h7(a) {
+            let b = this.ev;
+            this.ev = a;
+            if (b != this.ev) {
+                this.db("OutlinedSelectedItemTextColor", b, a);
             }
         }
         get h5() {
@@ -1042,67 +1036,27 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.et;
             this.et = a;
             if (b != this.et) {
-                this.da("OutlinedSelectedItemHoverTextColor", b, a);
-            }
-        }
-        get az() {
-            return this.af;
-        }
-        set az(a) {
-            let b = this.af;
-            this.af = a;
-            if (b != this.af) {
-                this.da("FlatItemCornerRadius", b, a);
-            }
-        }
-        get hb() {
-            return this.dz;
-        }
-        set hb(a) {
-            let b = this.dz;
-            this.dz = a;
-            if (b != this.dz) {
-                this.da("FlatItemBackgroundColor", b, a);
-            }
-        }
-        get hd() {
-            return this.d1;
-        }
-        set hd(a) {
-            let b = this.d1;
-            this.d1 = a;
-            if (b != this.d1) {
-                this.da("FlatItemDisabledBackgroundColor", b, a);
-            }
-        }
-        get hi() {
-            return this.d6;
-        }
-        set hi(a) {
-            let b = this.d6;
-            this.d6 = a;
-            if (b != this.d6) {
-                this.da("FlatItemTextColor", b, a);
+                this.db(XButtonGroup.cw, b, a);
             }
         }
-        get hf() {
-            return this.d3;
+        get h6() {
+            return this.eu;
         }
-        set hf(a) {
-            let b = this.d3;
-            this.d3 = a;
-            if (b != this.d3) {
-                this.da("FlatItemDisabledTextColor", b, a);
+        set h6(a) {
+            let b = this.eu;
+            this.eu = a;
+            if (b != this.eu) {
+                this.db("OutlinedSelectedItemHoverTextColor", b, a);
             }
         }
-        get hg() {
-            return this.d4;
+        get a0() {
+            return this.ag;
         }
-        set hg(a) {
-            let b = this.d4;
-            this.d4 = a;
-            if (b != this.d4) {
-                this.da("FlatItemHoverBackgroundColor", b, a);
+        set a0(a) {
+            let b = this.ag;
+            this.ag = a;
+            if (b != this.ag) {
+                this.db("FlatItemCornerRadius", b, a);
             }
         }
         get hc() {
@@ -1112,7 +1066,7 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.d0;
             this.d0 = a;
             if (b != this.d0) {
-                this.da("FlatItemBorderColor", b, a);
+                this.db("FlatItemBackgroundColor", b, a);
             }
         }
         get he() {
@@ -1122,17 +1076,27 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.d2;
             this.d2 = a;
             if (b != this.d2) {
-                this.da("FlatItemDisabledBorderColor", b, a);
+                this.db("FlatItemDisabledBackgroundColor", b, a);
             }
         }
-        get ay() {
-            return this.ae;
+        get hj() {
+            return this.d7;
         }
-        set ay(a) {
-            let b = this.ae;
-            this.ae = a;
-            if (b != this.ae) {
-                this.da("FlatItemBorderWidth", b, a);
+        set hj(a) {
+            let b = this.d7;
+            this.d7 = a;
+            if (b != this.d7) {
+                this.db("FlatItemTextColor", b, a);
+            }
+        }
+        get hg() {
+            return this.d4;
+        }
+        set hg(a) {
+            let b = this.d4;
+            this.d4 = a;
+            if (b != this.d4) {
+                this.db("FlatItemDisabledTextColor", b, a);
             }
         }
         get hh() {
@@ -1142,27 +1106,47 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.d5;
             this.d5 = a;
             if (b != this.d5) {
-                this.da("FlatItemHoverTextColor", b, a);
+                this.db("FlatItemHoverBackgroundColor", b, a);
             }
         }
-        get hj() {
-            return this.en;
+        get hd() {
+            return this.d1;
         }
-        set hj(a) {
-            let b = this.en;
-            this.en = a;
-            if (b != this.en) {
-                this.da("FlatSelectedItemBackgroundColor", b, a);
+        set hd(a) {
+            let b = this.d1;
+            this.d1 = a;
+            if (b != this.d1) {
+                this.db("FlatItemBorderColor", b, a);
             }
         }
-        get hm() {
-            return this.eq;
+        get hf() {
+            return this.d3;
         }
-        set hm(a) {
-            let b = this.eq;
-            this.eq = a;
-            if (b != this.eq) {
-                this.da("FlatSelectedItemTextColor", b, a);
+        set hf(a) {
+            let b = this.d3;
+            this.d3 = a;
+            if (b != this.d3) {
+                this.db("FlatItemDisabledBorderColor", b, a);
+            }
+        }
+        get az() {
+            return this.af;
+        }
+        set az(a) {
+            let b = this.af;
+            this.af = a;
+            if (b != this.af) {
+                this.db("FlatItemBorderWidth", b, a);
+            }
+        }
+        get hi() {
+            return this.d6;
+        }
+        set hi(a) {
+            let b = this.d6;
+            this.d6 = a;
+            if (b != this.d6) {
+                this.db("FlatItemHoverTextColor", b, a);
             }
         }
         get hk() {
@@ -1172,7 +1156,17 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.eo;
             this.eo = a;
             if (b != this.eo) {
-                this.da("FlatSelectedItemHoverBackgroundColor", b, a);
+                this.db("FlatSelectedItemBackgroundColor", b, a);
+            }
+        }
+        get hn() {
+            return this.er;
+        }
+        set hn(a) {
+            let b = this.er;
+            this.er = a;
+            if (b != this.er) {
+                this.db("FlatSelectedItemTextColor", b, a);
             }
         }
         get hl() {
@@ -1182,7 +1176,17 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.ep;
             this.ep = a;
             if (b != this.ep) {
-                this.da("FlatSelectedItemHoverTextColor", b, a);
+                this.db("FlatSelectedItemHoverBackgroundColor", b, a);
+            }
+        }
+        get hm() {
+            return this.eq;
+        }
+        set hm(a) {
+            let b = this.eq;
+            this.eq = a;
+            if (b != this.eq) {
+                this.db("FlatSelectedItemHoverTextColor", b, a);
             }
         }
         get k() {
@@ -1192,41 +1196,41 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
             let b = this.j;
             this.j = a;
             if (b != this.j) {
-                this.da("Orientation", enumGetBox(ButtonGroupOrientation_$type, b), enumGetBox(ButtonGroupOrientation_$type, a));
+                this.db("Orientation", enumGetBox(ButtonGroupOrientation_$type, b), enumGetBox(ButtonGroupOrientation_$type, a));
             }
         }
-        get b5() {
-            return this.a6;
+        get b6() {
+            return this.a7;
         }
-        set b5(a) {
-            let b = this.a6;
-            this.a6 = a;
-            if (b != this.a6) {
-                this.da("Id", b, a);
+        set b6(a) {
+            let b = this.a7;
+            this.a7 = a;
+            if (b != this.a7) {
+                this.db("Id", b, a);
             }
         }
         get disabled() {
-            return this.w;
-        }
-        set disabled(a) {
-            let b = this.w;
-            this.w = a;
-            this.v = true;
-            if (b != this.w) {
-                this.da("IsDisabled", b, a);
-            }
-        }
-        get z() {
             return this.x;
         }
-        set z(a) {
+        set disabled(a) {
             let b = this.x;
             this.x = a;
+            this.w = true;
             if (b != this.x) {
-                this.da("IsMultiSelect", b, a);
+                this.db("IsDisabled", b, a);
+            }
+        }
+        get aa() {
+            return this.y;
+        }
+        set aa(a) {
+            let b = this.y;
+            this.y = a;
+            if (b != this.y) {
+                this.db("IsMultiSelect", b, a);
             }
         }
-        db() {
+        dc() {
         }
         onDetachedFromUI() {
             this.view.u();
@@ -1234,31 +1238,31 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
         onAttachedToUI() {
             this.view.s();
         }
-        ab() {
+        ac() {
             return this.view.d();
         }
-        a5() {
+        a6() {
             return this.e();
         }
-        bq() {
+        br() {
             let a = this.e();
             return a.p();
         }
         e() {
             let a = new ButtonGroupVisualModelExport();
-            a.e = this.p;
-            a.f = this.s;
+            a.e = this.q;
+            a.f = this.t;
             a.a = this.d;
-            a.k = this.al;
-            a.b = AppearanceHelper.a(this.ez);
-            a.d = AppearanceHelper.a(this.e6);
-            a.c = AppearanceHelper.a(this.e0);
-            a.j = this.ak;
+            a.k = this.am;
+            a.b = AppearanceHelper.a(this.e0);
+            a.d = AppearanceHelper.a(this.e7);
+            a.c = AppearanceHelper.a(this.e1);
+            a.j = this.al;
             a.g = this.disabled;
-            a.h = this.z;
+            a.h = this.aa;
             a.i = new List$1(ButtonVisualModelExport.$, 0);
             for (let b = 0; b < this.buttons.count; b++) {
-                a.i.add1(this.buttons._inner[b].eb());
+                a.i.add1(this.buttons._inner[b].ec());
             }
             return a;
         }
@@ -1270,64 +1274,74 @@ export let XButtonGroup = /*@__PURE__*/ (() => {
         }
     }
     XButtonGroup.$t = markType(XButtonGroup, 'XButtonGroup', Base.$, [INotifyPropertyChanged_$type]);
-    XButtonGroup.o = 2;
-    XButtonGroup.av = 4;
-    XButtonGroup.gn = BrushUtil.j(255, 255, 255, 255);
-    XButtonGroup.gp = BrushUtil.j(10, 0, 0, 0);
-    XButtonGroup.go = BrushUtil.j(255, 199, 199, 199);
-    XButtonGroup.gq = BrushUtil.j(255, 199, 199, 199);
-    XButtonGroup.au = 1;
-    XButtonGroup.gu = BrushUtil.j(255, 0, 0, 0);
-    XButtonGroup.gr = BrushUtil.j(66, 0, 0, 0);
-    XButtonGroup.gv = BrushUtil.j(60, 0, 0, 0);
-    XButtonGroup.gy = BrushUtil.j(255, 0, 0, 0);
-    XButtonGroup.gs = BrushUtil.j(30, 0, 0, 0);
-    XButtonGroup.gt = BrushUtil.j(255, 0, 0, 0);
-    XButtonGroup.gw = BrushUtil.j(96, 0, 0, 0);
-    XButtonGroup.gx = BrushUtil.j(255, 0, 0, 0);
-    XButtonGroup.ap = 3;
-    XButtonGroup.fn = BrushUtil.j(0, 255, 255, 255);
-    XButtonGroup.fp = BrushUtil.j(10, 0, 0, 0);
-    XButtonGroup.fo = BrushUtil.j(255, 33, 150, 243);
-    XButtonGroup.fq = BrushUtil.j(255, 199, 199, 199);
-    XButtonGroup.ao = 1;
-    XButtonGroup.fu = BrushUtil.j(255, 33, 150, 243);
-    XButtonGroup.fr = BrushUtil.j(66, 0, 0, 0);
-    XButtonGroup.fv = BrushUtil.j(255, 33, 150, 243);
-    XButtonGroup.fy = BrushUtil.j(255, 255, 255, 255);
-    XButtonGroup.fs = BrushUtil.j(26, 33, 150, 243);
-    XButtonGroup.ft = BrushUtil.j(255, 33, 150, 243);
-    XButtonGroup.fw = BrushUtil.j(255, 33, 150, 243);
-    XButtonGroup.fx = BrushUtil.j(255, 255, 255, 255);
-    XButtonGroup.at = 4;
-    XButtonGroup.gb = BrushUtil.j(0, 255, 255, 255);
-    XButtonGroup.gd = BrushUtil.j(10, 0, 0, 0);
-    XButtonGroup.gc = BrushUtil.j(0, 0, 0, 0);
-    XButtonGroup.ge = BrushUtil.j(255, 199, 199, 199);
-    XButtonGroup.as = 0;
-    XButtonGroup.gi = BrushUtil.j(255, 228, 28, 119);
-    XButtonGroup.gf = BrushUtil.j(66, 0, 0, 0);
-    XButtonGroup.gj = BrushUtil.j(30, 228, 28, 119);
-    XButtonGroup.gm = BrushUtil.j(255, 228, 28, 119);
-    XButtonGroup.gg = BrushUtil.j(13, 228, 28, 119);
-    XButtonGroup.gh = BrushUtil.j(255, 228, 28, 119);
-    XButtonGroup.gk = BrushUtil.j(30, 228, 28, 119);
-    XButtonGroup.gl = BrushUtil.j(255, 228, 28, 119);
+    XButtonGroup.p = 2;
+    XButtonGroup.aw = 4;
+    XButtonGroup.go = BrushUtil.l(255, 255, 255, 255);
+    XButtonGroup.gq = BrushUtil.l(10, 0, 0, 0);
+    XButtonGroup.gp = BrushUtil.l(255, 199, 199, 199);
+    XButtonGroup.gr = BrushUtil.l(255, 199, 199, 199);
+    XButtonGroup.av = 1;
+    XButtonGroup.gv = BrushUtil.l(255, 0, 0, 0);
+    XButtonGroup.gs = BrushUtil.l(66, 0, 0, 0);
+    XButtonGroup.gw = BrushUtil.l(60, 0, 0, 0);
+    XButtonGroup.gz = BrushUtil.l(255, 0, 0, 0);
+    XButtonGroup.gt = BrushUtil.l(30, 0, 0, 0);
+    XButtonGroup.gu = BrushUtil.l(255, 0, 0, 0);
+    XButtonGroup.gx = BrushUtil.l(96, 0, 0, 0);
+    XButtonGroup.gy = BrushUtil.l(255, 0, 0, 0);
+    XButtonGroup.aq = 3;
+    XButtonGroup.fo = BrushUtil.l(0, 255, 255, 255);
+    XButtonGroup.fq = BrushUtil.l(10, 0, 0, 0);
+    XButtonGroup.fp = BrushUtil.l(255, 33, 150, 243);
+    XButtonGroup.fr = BrushUtil.l(255, 199, 199, 199);
+    XButtonGroup.ap = 1;
+    XButtonGroup.fv = BrushUtil.l(255, 33, 150, 243);
+    XButtonGroup.fs = BrushUtil.l(66, 0, 0, 0);
+    XButtonGroup.fw = BrushUtil.l(255, 33, 150, 243);
+    XButtonGroup.fz = BrushUtil.l(255, 255, 255, 255);
+    XButtonGroup.ft = BrushUtil.l(26, 33, 150, 243);
+    XButtonGroup.fu = BrushUtil.l(255, 33, 150, 243);
+    XButtonGroup.fx = BrushUtil.l(255, 33, 150, 243);
+    XButtonGroup.fy = BrushUtil.l(255, 255, 255, 255);
+    XButtonGroup.au = 4;
+    XButtonGroup.gc = BrushUtil.l(0, 255, 255, 255);
+    XButtonGroup.ge = BrushUtil.l(10, 0, 0, 0);
+    XButtonGroup.gd = BrushUtil.l(0, 0, 0, 0);
+    XButtonGroup.gf = BrushUtil.l(255, 199, 199, 199);
+    XButtonGroup.at = 0;
+    XButtonGroup.gj = BrushUtil.l(255, 228, 28, 119);
+    XButtonGroup.gg = BrushUtil.l(66, 0, 0, 0);
+    XButtonGroup.gk = BrushUtil.l(30, 228, 28, 119);
+    XButtonGroup.gn = BrushUtil.l(255, 228, 28, 119);
+    XButtonGroup.gh = BrushUtil.l(13, 228, 28, 119);
+    XButtonGroup.gi = BrushUtil.l(255, 228, 28, 119);
+    XButtonGroup.gl = BrushUtil.l(30, 228, 28, 119);
+    XButtonGroup.gm = BrushUtil.l(255, 228, 28, 119);
+    XButtonGroup.ao = 0;
+    XButtonGroup.fc = BrushUtil.l(0, 255, 255, 255);
+    XButtonGroup.fe = BrushUtil.l(10, 0, 0, 0);
+    XButtonGroup.fd = BrushUtil.l(0, 0, 0, 0);
+    XButtonGroup.ff = BrushUtil.l(0, 0, 0, 0);
     XButtonGroup.an = 0;
-    XButtonGroup.fb = BrushUtil.j(0, 255, 255, 255);
-    XButtonGroup.fd = BrushUtil.j(10, 0, 0, 0);
-    XButtonGroup.fc = BrushUtil.j(0, 0, 0, 0);
-    XButtonGroup.fe = BrushUtil.j(0, 0, 0, 0);
-    XButtonGroup.am = 0;
-    XButtonGroup.fi = BrushUtil.j(255, 119, 119, 119);
-    XButtonGroup.ff = BrushUtil.j(66, 0, 0, 0);
-    XButtonGroup.fj = BrushUtil.j(26, 33, 150, 243);
-    XButtonGroup.fm = BrushUtil.j(255, 33, 150, 243);
-    XButtonGroup.fg = BrushUtil.j(10, 33, 150, 243);
-    XButtonGroup.fh = BrushUtil.j(255, 119, 119, 119);
-    XButtonGroup.fk = BrushUtil.j(26, 33, 150, 243);
-    XButtonGroup.fl = BrushUtil.j(255, 33, 150, 243);
-    XButtonGroup.cv = "OutlinedSelectedItemHoverBackgroundColor";
-    XButtonGroup.a4 = 0;
+    XButtonGroup.fj = BrushUtil.l(255, 119, 119, 119);
+    XButtonGroup.fg = BrushUtil.l(66, 0, 0, 0);
+    XButtonGroup.fk = BrushUtil.l(26, 33, 150, 243);
+    XButtonGroup.fn = BrushUtil.l(255, 33, 150, 243);
+    XButtonGroup.fh = BrushUtil.l(10, 33, 150, 243);
+    XButtonGroup.fi = BrushUtil.l(255, 119, 119, 119);
+    XButtonGroup.fl = BrushUtil.l(26, 33, 150, 243);
+    XButtonGroup.fm = BrushUtil.l(255, 33, 150, 243);
+    XButtonGroup.cw = "OutlinedSelectedItemHoverBackgroundColor";
+    XButtonGroup.a5 = 0;
+    XButtonGroup.n = new ThemeResolver(1, ((() => {
+        let $ret = new Dictionary$2(BaseControlTheme_$type, Theme.$, 0);
+        $ret.addItem(2, XButton.i);
+        $ret.addItem(1, XButton.h);
+        $ret.addItem(3, XButton.k);
+        $ret.addItem(4, XButton.j);
+        $ret.addItem(5, XButton.k);
+        $ret.addItem(6, XButton.j);
+        return $ret;
+    })()), 2);
     return XButtonGroup;
 })();