From 8ff63219a3f5f13b93865b2180be93a7f7e074bc Mon Sep 17 00:00:00 2001
From: bharnden <32446120+bharnden@users.noreply.github.com>
Date: Thu, 21 Nov 2019 22:55:37 -0800
Subject: [PATCH] increased node icon size, added improve way to offset text
 regardless of icon size

---
 coretk/coretk/graph.py     | 6 +++++-
 coretk/coretk/images.py    | 2 --
 coretk/coretk/nodeutils.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/coretk/coretk/graph.py b/coretk/coretk/graph.py
index 2c874f34..545cbb41 100644
--- a/coretk/coretk/graph.py
+++ b/coretk/coretk/graph.py
@@ -18,6 +18,8 @@ from coretk.nodedelete import CanvasComponentManagement
 from coretk.nodeutils import NodeUtils
 from coretk.wirelessconnection import WirelessConnection
 
+NODE_TEXT_OFFSET = 5
+
 
 class GraphMode(enum.Enum):
     SELECT = 0
@@ -615,8 +617,10 @@ class CanvasNode:
         self.id = self.canvas.create_image(
             x, y, anchor=tk.CENTER, image=self.image, tags="node"
         )
+        image_box = self.canvas.bbox(self.id)
+        y = image_box[3] + NODE_TEXT_OFFSET
         self.text_id = self.canvas.create_text(
-            x, y + 20, text=self.core_node.name, tags="nodename"
+            x, y, text=self.core_node.name, tags="nodename"
         )
         self.antenna_draw = WlanAntennaManager(self.canvas, self.id)
         self.tooltip = CanvasTooltip(self.canvas)
diff --git a/coretk/coretk/images.py b/coretk/coretk/images.py
index 3763f2d2..287a7359 100644
--- a/coretk/coretk/images.py
+++ b/coretk/coretk/images.py
@@ -4,8 +4,6 @@ from PIL import Image, ImageTk
 
 from coretk.appconfig import LOCAL_ICONS_PATH
 
-NODE_WIDTH = 32
-
 
 class Images:
     images = {}
diff --git a/coretk/coretk/nodeutils.py b/coretk/coretk/nodeutils.py
index fcc29953..18b468b5 100644
--- a/coretk/coretk/nodeutils.py
+++ b/coretk/coretk/nodeutils.py
@@ -1,7 +1,7 @@
 from core.api.grpc.core_pb2 import NodeType
 from coretk.images import ImageEnum, Images
 
-ICON_SIZE = 32
+ICON_SIZE = 48
 
 
 class NodeDraw: