chore: changed the way to set visual cues in BattereryIndicator

Dygmalab · Aug 25, 2023 · 94709a4 · 94709a4
1 parent 258addc
commit 94709a4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/renderer/component/Battery/BatteryStatusSide.tsx b/src/renderer/component/Battery/BatteryStatusSide.tsx
@@ -236,7 +236,13 @@ const BatteryStatusSide: React.FC<BatteryStatusSideProps> = ({ side, batteryLeve
     // console.log("batteryStatus", batteryStatus);
     switch (batteryStatus) {
       case 0:
-        setSideStatus("status--default");
+        if (batteryLevel > 10 && batteryLevel < 20 && !isSavingMode) {
+          setSideStatus("status--warning");
+        } else if (batteryLevel <= 10 && !isSavingMode) {
+          setSideStatus("status--critical");
+        } else {
+          setSideStatus("status--default");
+        }
         break;
       case 1:
         setSideStatus("status--charging");
@@ -253,13 +259,7 @@ const BatteryStatusSide: React.FC<BatteryStatusSideProps> = ({ side, batteryLeve
       default:
         setSideStatus("status--fatal-error");
     }
-    if (batteryLevel > 10 && batteryLevel < 20 && !isSavingMode && batteryStatus === 0) {
-      setSideStatus("status--warning");
-    }
-    if (batteryLevel < 10 && !isSavingMode && batteryStatus === 0) {
-      setSideStatus("status--critical");
-    }
-  }, [size, batteryLevel, batteryStatus, isSavingMode]);
+  }, [batteryLevel, batteryStatus, isSavingMode]);
 
   if (loading) return null;
   return (

diff --git a/src/renderer/component/Battery/PileIndicator.tsx b/src/renderer/component/Battery/PileIndicator.tsx
@@ -14,7 +14,7 @@ const PileIndicator = ({ batteryLevel, batteryStatus }: PileIndicatorProps) => {
   useEffect(() => {
     switch (batteryStatus) {
       case 0:
-        if (batteryLevel < 5) {
+        if (batteryLevel <= 5) {
           setBatteryWidth(1);
         } else {
           setBatteryWidth((16 * batteryLevel) / 100);

diff --git a/src/renderer/component/Select/SelectSuperKeyCustomDropdown.js b/src/renderer/component/Select/SelectSuperKeyCustomDropdown.js
@@ -93,6 +93,20 @@ width: 100%;
   height: 142px;
   overflow-y: auto;
 }
+@media (max-width: 980px) {
+  .custom-dropdown {
+    .dropdownItem {
+      overflow: initial;
+      position: relative;
+    }
+    .badge.badge-primary {
+      font-size: 7px;
+      position: absolute;
+      top: -6px;
+      margin-left: -3px;
+    }
+  }
+}
 `;
 
 class SelectSuperKeyCustomDropdown extends Component {