mirror of
https://github.com/home-assistant/frontend.git
synced 2025-07-28 11:46:42 +00:00
Increase area card default height when using camera and features (#26205)
This commit is contained in:
parent
0839528e22
commit
767d785d04
@ -115,7 +115,7 @@ export class HuiAreaCard extends LitElement implements LovelaceCard {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public getGridOptions(): LovelaceGridOptions {
|
public getGridOptions(): LovelaceGridOptions {
|
||||||
const columns = 6;
|
let columns = 6;
|
||||||
let min_columns = 6;
|
let min_columns = 6;
|
||||||
let rows = 1;
|
let rows = 1;
|
||||||
const featurePosition = this._config
|
const featurePosition = this._config
|
||||||
@ -125,6 +125,7 @@ export class HuiAreaCard extends LitElement implements LovelaceCard {
|
|||||||
if (featuresCount) {
|
if (featuresCount) {
|
||||||
if (featurePosition === "inline") {
|
if (featurePosition === "inline") {
|
||||||
min_columns = 12;
|
min_columns = 12;
|
||||||
|
columns = 12;
|
||||||
} else {
|
} else {
|
||||||
rows += featuresCount;
|
rows += featuresCount;
|
||||||
}
|
}
|
||||||
@ -133,8 +134,12 @@ export class HuiAreaCard extends LitElement implements LovelaceCard {
|
|||||||
const displayType = this._config?.display_type || "picture";
|
const displayType = this._config?.display_type || "picture";
|
||||||
|
|
||||||
if (displayType !== "compact") {
|
if (displayType !== "compact") {
|
||||||
|
if (featurePosition === "inline" && featuresCount > 0) {
|
||||||
|
rows += 3;
|
||||||
|
} else {
|
||||||
rows += 2;
|
rows += 2;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
columns,
|
columns,
|
||||||
|
@ -98,11 +98,11 @@ export class AreasOverviewViewStrategy extends ReactiveElement {
|
|||||||
sensorClasses.push("humidity");
|
sensorClasses.push("humidity");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isLarge = areaOptions.card_size === "large";
|
||||||
return {
|
return {
|
||||||
type: "area",
|
type: "area",
|
||||||
area: area.area_id,
|
area: area.area_id,
|
||||||
display_type:
|
display_type: isLarge ? "camera" : "compact",
|
||||||
areaOptions.card_size === "large" ? "camera" : "compact",
|
|
||||||
sensor_classes: sensorClasses,
|
sensor_classes: sensorClasses,
|
||||||
exclude_entities: hiddenEntities,
|
exclude_entities: hiddenEntities,
|
||||||
features: filteredControls.length
|
features: filteredControls.length
|
||||||
@ -114,7 +114,7 @@ export class AreasOverviewViewStrategy extends ReactiveElement {
|
|||||||
]
|
]
|
||||||
: [],
|
: [],
|
||||||
grid_options: {
|
grid_options: {
|
||||||
rows: 1,
|
rows: isLarge ? 4 : 1,
|
||||||
columns: 12,
|
columns: 12,
|
||||||
},
|
},
|
||||||
features_position: "inline",
|
features_position: "inline",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user