Merge branch 'master' of https://github.com/haxeui/haxeui-core

haxeui · Jan 20, 2024 · b78aa8e · b78aa8e
2 parents b7389c2 + c089834
commit b78aa8e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/haxe/ui/_module/styles/default/pickers.css b/haxe/ui/_module/styles/default/pickers.css
@@ -131,6 +131,10 @@
     border: 1px solid $accent-color;
 }
 
+.month-picker-panel {
+    background-color: $default-background-color;
+}
+
 .month-deinc {
     resource: $arrow-left;
 }
@@ -157,6 +161,11 @@
     background-color: $default-background-color;
 }
 
+.month-picker-panel #yearLabel {
+    background-color: $normal-background-color-start;
+    border-top: 1px solid $normal-border-color;
+}
+
 /************************************************************************
 ** MENU ITEM PICKER
 *************************************************************************/

diff --git a/haxe/ui/components/pickers/MonthPicker.hx b/haxe/ui/components/pickers/MonthPicker.hx
@@ -97,7 +97,7 @@ private class Handler extends ItemPickerHandler {
 }
 
 @:xml('
-<vbox style="padding: 0px;spacing:0;background-color: $default-background-color">
+<vbox style="padding: 0px;spacing:0;">
     <hbox width="100%" style="padding:10px;padding-top: 15px;padding-bottom:15px;spacing:10px;">
         <image verticalAlign="center" styleName="month-deinc" />
         <grid id="monthButtons" columns="4" width="100%">
@@ -116,7 +116,7 @@ private class Handler extends ItemPickerHandler {
         </grid>
         <image verticalAlign="center" styleName="month-inc" />
     </hbox>    
-    <label id="yearLabel" width="100%" horizontalAlign="center" style="background-color: $normal-background-color-start;text-align:center;padding: 5px;border-top:1px solid $normal-border-color;" />
+    <label id="yearLabel" width="100%" horizontalAlign="center" style="text-align:center;padding: 5px;" />
 </vbox>
 ')
 class MonthPickerPanel extends VBox {

diff --git a/haxe/ui/containers/Frame.hx b/haxe/ui/containers/Frame.hx
@@ -157,9 +157,11 @@ private class Builder extends CompositeBuilder {
 
     public function addCollapsibleHeader() {
         _component.addClass("collapsible-frame");
-        var header = _component.findComponent("frame-header", Header);
+        var header = _component.findComponent("frame-header", Header, false);
         if (header == null) {
             header = new Header();
+            header.id = "frame-header";
+            header.addClass("frame-header");
             header.includeInLayout = false;
             _component.addComponent(header);
         }