weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Toolbar button color different when hovering and selected

Browse Source
This commit is contained in:
Davide Passoni
2025-01-23 10:58:11 +01:00
parent d31aa30da8
commit 20db9647bd
17 changed files with 304 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/react/src/map/coalitionarea/coalitioncircle.ts
View File

@@ -1,7 +1,7 @@
import { LatLngExpression, Map, Circle, DivIcon, Marker, CircleOptions, LatLng } from "leaflet";
import { getApp } from "../../olympusapp";
import { CoalitionAreaHandle } from "./coalitionareahandle";
import { BLUE_COMMANDER, RED_COMMANDER } from "../../constants/constants";
import { BLUE_COMMANDER, colors, RED_COMMANDER } from "../../constants/constants";
import { Coalition } from "../../types/types";
import * as turf from "@turf/turf";
import { CoalitionAreaChangedEvent, CoalitionAreaSelectedEvent } from "../../events";
@@ -125,12 +125,12 @@ export class CoalitionCircle extends Circle {
}
#setColors() {
let coalitionColor = "#FFFFFF";
if (this.getCoalition() === "blue") coalitionColor = "#247be2";
else if (this.getCoalition() === "red") coalitionColor = "#ff5858";
let coalitionColor = colors.NEUTRAL_COALITION;
if (this.getCoalition() === "blue") coalitionColor = colors.BLUE_COALITION;
else if (this.getCoalition() === "red") coalitionColor = colors.RED_COALITION;
this.setStyle({
color: this.getSelected() ? "white" : coalitionColor,
color: this.getSelected() ? colors.WHITE : coalitionColor,
fillColor: coalitionColor,
});
}

8
frontend/react/src/map/coalitionarea/coalitionpolygon.ts
View File

@@ -2,7 +2,7 @@ import { LatLng, LatLngExpression, Map, Point, Polygon, PolylineOptions, DivIcon
import { getApp } from "../../olympusapp";
import { CoalitionAreaHandle } from "./coalitionareahandle";
import { CoalitionAreaMiddleHandle } from "./coalitionareamiddlehandle";
import { BLUE_COMMANDER, RED_COMMANDER } from "../../constants/constants";
import { BLUE_COMMANDER, colors, RED_COMMANDER } from "../../constants/constants";
import { Coalition } from "../../types/types";
import { polyCenter } from "../../other/utils";
import { CoalitionAreaChangedEvent, CoalitionAreaSelectedEvent } from "../../events";
@@ -150,9 +150,9 @@ export class CoalitionPolygon extends Polygon {
}
#setColors() {
let coalitionColor = "#FFFFFF";
if (this.getCoalition() === "blue") coalitionColor = "#247be2";
else if (this.getCoalition() === "red") coalitionColor = "#ff5858";
let coalitionColor = colors.NEUTRAL_COALITION;
if (this.getCoalition() === "blue") coalitionColor = colors.BLUE_COALITION;
else if (this.getCoalition() === "red") coalitionColor = colors.RED_COALITION;
this.setStyle({
color: this.getSelected() ? "white" : coalitionColor,

3
frontend/react/src/map/map.ts
View File

@@ -25,6 +25,7 @@ import {
SHORT_PRESS_MILLISECONDS,
DEBOUNCE_MILLISECONDS,
DrawSubState,
colors,
} from "../constants/constants";
import { MapHiddenTypes, MapOptions } from "../types/types";
import { EffectRequestTable, OlympusConfig, SpawnRequestTable } from "../interfaces";
@@ -177,7 +178,7 @@ export class Map extends L.Map {
maxZoom: 13,
});
this.#miniMapLayerGroup = new L.LayerGroup([minimapLayer]);
this.#miniMapPolyline = new L.Polyline([], { color: "#202831" });
this.#miniMapPolyline = new L.Polyline([], { color: colors.DARK_GRAY });
this.#miniMapPolyline.addTo(this.#miniMapLayerGroup);
/* Register event handles */