Skip to content

Commit 3d4e1f6

Browse files
committed
Change update method to sizing & positionning, add SplitButton Component and add favicon
1 parent 7e48e2f commit 3d4e1f6

36 files changed

+531
-909
lines changed

apps/controls/css/carbon.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@
3434
@import url('/themes/css/carbon/toolbars/toolbutton.css');
3535
@import url('/themes/css/carbon/extended/iphonebutton.css');
3636
@import url('/themes/css/carbon/extended/popupbutton.css');
37-
@import url('/themes/css/carbon/common/calendar.css');
37+
@import url('/themes/css/carbon/common/calendar.css');
38+
@import url('/themes/css/carbon/extended/splitbutton.css');

apps/controls/html/window1.html

Lines changed: 69 additions & 80 deletions
Large diffs are not rendered by default.

apps/controls/js/window1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ import "/scripts/components/common/calendar.js";
7171
//import { dropDownTimePanel } from "/scripts/components/common/dropDownTimePanel.js";
7272
import "/scripts/components/extended/bitmapstatebutton.js";
7373
import "/scripts/components/common/busyindicator.js";
74-
//import { splitButton } from "/scripts/components/extended/splitButton.js";
74+
import "/scripts/components/extended/splitbutton.js";
7575
//import { commonDialog } from "/scripts/components/dialogs/commonDialog.js";
7676
//import { openDialog } from "/scripts/components/dialogs/openDialog.js";
7777
//import { findReplaceDialog } from "/scripts/components/dialogs/findReplaceDialog.js";
Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
div.SplitButton {
1+
.Control.SplitButton {
22
display: flex;
33
flex-direction: row;
44
flex-wrap: nowrap;
55
}
66

7-
div.SplitButton button.BitmapButton {
8-
flex: 1;
9-
height: 100% !important;
10-
}
7+
.Control.SplitButton > * {
8+
position: relative;
9+
}
1110

12-
div.SplitButton button.BitmapButton,
13-
div.SplitButton button.PopupButton {
14-
position: relative;
15-
}
11+
.Control.SplitButton .BitmapButton {
12+
flex: 1;
13+
}
1614

17-
div.SplitButton button.PopupButton {
18-
width: 14px !important;
19-
border-left: none;
20-
}
15+
.Control.SplitButton .BitmapButton,
16+
.Control.SplitButton .PopupButton {
17+
position: relative;
18+
}
2119

22-
div.SplitButton div.PopupButtonArrow {
23-
right: 3px;
24-
}
20+
.Control.SplitButton .PopupButton {
21+
width: 14px;
22+
border-left: none;
23+
}
24+
25+
.Control.SplitButton .PopupButtonArrow {
26+
right: 3px;
27+
}

favicon.ico

1.12 KB
Binary file not shown.

scripts/components/color/colorbox.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ColorBox extends GraphicControl {
4141
//#region Methods
4242
//#region update
4343
update() {
44-
super.update();
44+
//super.update();
4545
if (Core.isHTMLRenderer && this.HTMLElement) {
4646
this.HTMLElementStyle.boxShadow = `inset 0 0 0 1000px ${this.fillColor.toRGBAString()}`;
4747
}

scripts/components/color/colorbutton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const ColorButton = (() => {
8888
//#region Variables déclaration
8989
const priv = internal(this);
9090
//#endregion Variables déclaration
91-
super.update();
91+
//super.update();
9292
if (this.textObj) {
9393
this.textObj.innerHTML = String.EMPTY;
9494
}

scripts/components/color/colorpicker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const ColorPicker = (() => {
6565
let pos = ~~(priv.color.hue * htmlElement.offsetHeight / 360);
6666
pos -= COLORPICKSIZE / 2;
6767
priv.handle.y = (pos > htmlElement.offsetHeight - 5 ? htmlElement.offsetHeight - 5 : (pos < -5) ? -5 : pos);
68-
this._update();
68+
this.update();
6969
}
7070
}
7171
}
@@ -158,7 +158,7 @@ const ColorPicker = (() => {
158158
const htmlElement = this.HTMLElement;
159159
const COLORPICKSIZE = Types.CONSTANTS.COLORPICKSIZE;
160160
//#endregion Variables déclaration
161-
super.update();
161+
//super.update();
162162
if (!point) {
163163
point = new Point;
164164
point.x = 0;

scripts/components/color/colorquad.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ const ColorQuad = (() => {
175175
const COLORPICKSIZE = Types.CONSTANTS.COLORPICKSIZE;
176176
const PX = Types.CSSUNITS.PX;
177177
//#endregion Variables déclaration
178-
super.update();
178+
//super.update();
179179
if (!point) {
180180
point = new Point;
181181
let value;

scripts/components/common/batteryindicator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ const BatteryIndicator = (() => {
167167
PPoleAfter.style.borderRadius = `${60 * ratioW}${PX}/${27 * ratioH}${PX}`;
168168
NiMH.style.height = `${(priv.baseFluidHeight * battery.level) * ratioH}${PX}`;
169169
}
170-
super.update();
170+
//super.update();
171171
}
172172
loaded() {
173173
//#region Variables déclaration

0 commit comments

Comments
 (0)