From 11ca2293040b01207598ea2f4804cd85165cb50b Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 23 Dec 2024 13:36:24 -0800
Subject: [PATCH] Again trying to restore chart sizing

---
 src/styles/globals.css                        |  4 ++++
 src/widgets/glances/components/chart.jsx      |  2 +-
 src/widgets/glances/components/chart_dual.jsx |  2 +-
 src/widgets/glances/components/container.jsx  |  4 ++--
 src/widgets/glances/metrics/info.jsx          |  8 ++++----
 src/widgets/glances/metrics/process.jsx       | 10 ++++++++--
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/styles/globals.css b/src/styles/globals.css
index 1e91f86e..b1cc1edb 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -63,3 +63,7 @@ dialog ::-webkit-scrollbar {
 ::-webkit-details-marker {
   display: none;
 }
+
+.chart + .chart {
+  margin-top: 2em;
+}
diff --git a/src/widgets/glances/components/chart.jsx b/src/widgets/glances/components/chart.jsx
index 86811751..132fcc8e 100644
--- a/src/widgets/glances/components/chart.jsx
+++ b/src/widgets/glances/components/chart.jsx
@@ -8,7 +8,7 @@ class Chart extends PureComponent {
     const { dataPoints, formatter, label } = this.props;
 
     return (
-      <div className="absolute -top-2 -left-2 h-[calc(100%+1em)] w-[calc(100%+1em)] z-0">
+      <div className="absolute -top-10 -left-2 h-[calc(100%+3em)] w-[calc(100%+1em)] z-0">
         <div className="overflow-clip z-10 w-full h-full">
           <ResponsiveContainer width="100%" height="100%">
             <AreaChart data={dataPoints}>
diff --git a/src/widgets/glances/components/chart_dual.jsx b/src/widgets/glances/components/chart_dual.jsx
index 2a51cf91..5fabe755 100644
--- a/src/widgets/glances/components/chart_dual.jsx
+++ b/src/widgets/glances/components/chart_dual.jsx
@@ -8,7 +8,7 @@ class ChartDual extends PureComponent {
     const { dataPoints, formatter, stack, label, stackOffset } = this.props;
 
     return (
-      <div className="absolute -top-2 -left-2 h-[calc(100%+1em)] w-[calc(100%+1em)] z-0">
+      <div className="absolute -top-10 -left-2 h-[calc(100%+3em)] w-[calc(100%+1em)] z-0">
         <div className="overflow-clip z-10 w-full h-full">
           <ResponsiveContainer width="100%" height="100%">
             <AreaChart data={dataPoints} stackOffset={stackOffset ?? "none"}>
diff --git a/src/widgets/glances/components/container.jsx b/src/widgets/glances/components/container.jsx
index 92d7a45d..01a7e05d 100644
--- a/src/widgets/glances/components/container.jsx
+++ b/src/widgets/glances/components/container.jsx
@@ -18,9 +18,9 @@ export default function Container({ children, widget, error = null, chart = true
   }
 
   return (
-    <div className={classNames("service-container", chart ? "chart relative h-[120px]" : "")}>
+    <div className={classNames("service-container", chart ? "chart relative h-[68px]" : "")}>
       {children}
-      <div className={`absolute top-0 right-0 bottom-0 left-0 overflow-clip pointer-events-none ${className}`} />
+      <div className={`absolute -top-10 right-0 bottom-0 left-0 overflow-clip pointer-events-none ${className}`} />
       {chart && <div className="h-[68px] overflow-clip" />}
       {!chart && <div className="h-[16px] overflow-clip" />}
     </div>
diff --git a/src/widgets/glances/metrics/info.jsx b/src/widgets/glances/metrics/info.jsx
index ab73ca99..3fc7ab23 100644
--- a/src/widgets/glances/metrics/info.jsx
+++ b/src/widgets/glances/metrics/info.jsx
@@ -109,10 +109,10 @@ export default function Component({ service }) {
   return (
     <Container chart={chart}>
       {chart && (
-        <div className="bg-gradient-to-br from-theme-500/30 via-theme-600/20 to-theme-700/10 absolute -top-2 -left-2 -right-2 -bottom-2 h-[calc(100%+1em)] w-[calc(100%+1em)]" />
+        <div className="bg-gradient-to-br from-theme-500/30 via-theme-600/20 to-theme-700/10 absolute -top-10 -left-2 -right-2 -bottom-2 h-[calc(100%+3em)] w-[calc(100%+1em)]" />
       )}
 
-      <Block position="top-3 right-3">
+      <Block position="-top-6 right-2">
         {quicklookData && quicklookData.cpu_name && chart && (
           <div className="text-[0.6rem] opacity-50">{quicklookData.cpu_name}</div>
         )}
@@ -128,7 +128,7 @@ export default function Component({ service }) {
       </Block>
 
       {chart && (
-        <Block position="bottom-3 left-3">
+        <Block position="bottom-3 left-2">
           {systemData && systemData.linux_distro && <div className="text-xs opacity-50">{systemData.linux_distro}</div>}
           {systemData && systemData.os_version && <div className="text-xs opacity-50">{systemData.os_version}</div>}
           {systemData && systemData.hostname && <div className="text-xs opacity-75">{systemData.hostname}</div>}
@@ -141,7 +141,7 @@ export default function Component({ service }) {
         </Block>
       )}
 
-      <Block position="bottom-3 right-3 w-[4rem]">
+      <Block position="bottom-3 right-2 w-[4rem]">
         {chart && <CPU quicklookData={quicklookData} className="opacity-50" />}
 
         {chart && <Mem quicklookData={quicklookData} className="opacity-50" />}
diff --git a/src/widgets/glances/metrics/process.jsx b/src/widgets/glances/metrics/process.jsx
index b20b4c63..997948f4 100644
--- a/src/widgets/glances/metrics/process.jsx
+++ b/src/widgets/glances/metrics/process.jsx
@@ -42,10 +42,16 @@ export default function Component({ service }) {
   }
 
   data.splice(chart ? 5 : 1);
+  let headerYPosition = "top-4";
+  let listYPosition = "bottom-4";
+  if (chart) {
+    headerYPosition = "-top-6";
+    listYPosition = "-top-3";
+  }
 
   return (
     <Container chart={chart}>
-      <Block position="top-4 right-3 left-3">
+      <Block position={`${headerYPosition} right-3 left-3`}>
         <div className="flex items-center text-xs">
           <div className="grow" />
           <div className="w-14 text-right italic">{t("resources.cpu")}</div>
@@ -53,7 +59,7 @@ export default function Component({ service }) {
         </div>
       </Block>
 
-      <Block position="bottom-4 right-3 left-3">
+      <Block position={`${listYPosition} right-3 left-3`}>
         <div className="pointer-events-none text-theme-900 dark:text-theme-200">
           {data.map((item) => (
             <div key={item.pid} className="text-[0.75rem] h-[0.8rem]">