jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-21 16:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use color temperatures in Kelvin in more_info_light (#14016)

Browse Source
This commit is contained in:
Erik Montnemery 2022-10-10 20:12:36 +02:00 committed by GitHub
parent a4fcb743fa
commit fb80da013e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/data/light.ts
View File

@ -67,12 +67,15 @@ export const getLightCurrentModeRgbColor = (
: entity.attributes.rgb_color; : entity.attributes.rgb_color;
interface LightEntityAttributes extends HassEntityAttributeBase { interface LightEntityAttributes extends HassEntityAttributeBase {
min_color_temp_kelvin?: number;
max_color_temp_kelvin?: number;
min_mireds?: number; min_mireds?: number;
max_mireds?: number; max_mireds?: number;
brightness?: number; brightness?: number;
xy_color?: [number, number]; xy_color?: [number, number];
hs_color?: [number, number]; hs_color?: [number, number];
color_temp?: number; color_temp?: number;
color_temp_kelvin?: number;
rgb_color?: [number, number, number]; rgb_color?: [number, number, number];
rgbw_color?: [number, number, number, number]; rgbw_color?: [number, number, number, number];
rgbww_color?: [number, number, number, number, number]; rgbww_color?: [number, number, number, number, number];

14
src/dialogs/more-info/controls/more-info-light.ts
View File

@ -121,8 +121,8 @@ class MoreInfoLight extends LitElement {
"ui.card.light.color_temperature" "ui.card.light.color_temperature"
)} )}
icon="hass:thermometer" icon="hass:thermometer"
.min=${this.stateObj.attributes.min_mireds} .min=${this.stateObj.attributes.min_color_temp_kelvin}
.max=${this.stateObj.attributes.max_mireds} .max=${this.stateObj.attributes.max_color_temp_kelvin}
.value=${this._ctSliderValue} .value=${this._ctSliderValue}
@change=${this._ctSliderChanged} @change=${this._ctSliderChanged}
pin pin
@ -231,7 +231,7 @@ class MoreInfoLight extends LitElement {
<ha-attributes <ha-attributes
.hass=${this.hass} .hass=${this.hass}
.stateObj=${this.stateObj} .stateObj=${this.stateObj}
extra-filters="brightness,color_temp,white_value,effect_list,effect,hs_color,rgb_color,rgbw_color,rgbww_color,xy_color,min_mireds,max_mireds,entity_id,supported_color_modes,color_mode" extra-filters="brightness,color_temp,color_temp_kelvin,white_value,effect_list,effect,hs_color,rgb_color,rgbw_color,rgbww_color,xy_color,min_mireds,max_mireds,min_color_temp_kelvin,max_color_temp_kelvin,entity_id,supported_color_modes,color_mode"
></ha-attributes> ></ha-attributes>
</div> </div>
`; `;
@ -273,7 +273,7 @@ class MoreInfoLight extends LitElement {
this._brightnessSliderValue = Math.round( this._brightnessSliderValue = Math.round(
((stateObj.attributes.brightness || 0) * brightnessAdjust) / 255 ((stateObj.attributes.brightness || 0) * brightnessAdjust) / 255
); );
this._ctSliderValue = stateObj.attributes.color_temp; this._ctSliderValue = stateObj.attributes.color_temp_kelvin;
this._wvSliderValue = this._wvSliderValue =
stateObj.attributes.color_mode === LightColorMode.RGBW stateObj.attributes.color_mode === LightColorMode.RGBW
? Math.round((stateObj.attributes.rgbw_color![3] * 100) / 255) ? Math.round((stateObj.attributes.rgbw_color![3] * 100) / 255)
@ -384,7 +384,7 @@ class MoreInfoLight extends LitElement {
this.hass.callService("light", "turn_on", { this.hass.callService("light", "turn_on", {
entity_id: this.stateObj!.entity_id, entity_id: this.stateObj!.entity_id,
color_temp: ct, color_temp_kelvin: ct,
}); });
} }
@ -580,9 +580,9 @@ class MoreInfoLight extends LitElement {
.color_temp { .color_temp {
--ha-slider-background: -webkit-linear-gradient( --ha-slider-background: -webkit-linear-gradient(
var(--float-end), var(--float-end),
rgb(255, 160, 0) 0%, rgb(166, 209, 255) 0%,
white 50%, white 50%,
rgb(166, 209, 255) 100% rgb(255, 160, 0) 100%
); );
/* The color temp minimum value shouldn't be rendered differently. It's not "off". */ /* The color temp minimum value shouldn't be rendered differently. It's not "off". */
--paper-slider-knob-start-border-color: var(--primary-color); --paper-slider-knob-start-border-color: var(--primary-color);