From b45ee77472068aba9bbac7bfbc9ca453b305511f Mon Sep 17 00:00:00 2001
From: Bane Stojkovic <bancika@gmail.com>
Date: Wed, 14 Dec 2022 19:13:51 +0100
Subject: [PATCH] Upon starting or opening a project, the ruler is slightly
 misaligned with the project boundaries

---
 .../src/org/diylc/presenter/update.xml        |  4 ++++
 diylc/diylc-swing/dict.txt                    | 20 -------------------
 .../swing/plugins/canvas/CanvasPlugin.java    |  3 +++
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 210b1039..d816721f 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -4278,6 +4278,10 @@
 					<changeType>BUG_FIX</changeType>
 					<description>Diode symbol doesn't appear in the BOM</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Upon starting or opening a project, the ruler is slightly misaligned with the project boundaries</description>
+				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
diff --git a/diylc/diylc-swing/dict.txt b/diylc/diylc-swing/dict.txt
index ede313b2..9bc9768f 100644
--- a/diylc/diylc-swing/dict.txt
+++ b/diylc/diylc-swing/dict.txt
@@ -42,22 +42,15 @@
 6 throws / 6 positions
 7 throws / 7 positions
 8 throws / 8 positions
-9 Pin Socket 1 <font color='gray'>[DLH]</font>
 9 throws / 9 positions
 A-O-I     REGULATOR
 AC
 AWG
 Alternate
-Altoid Minty Copper Perfboard <font color='gray'>[pixelwaster]</font>
-Altoid Minty Plain Perfboard <font color='gray'>[pixelwaster]</font>
-Altoid Minty Vero Board <font color='gray'>[pixelwaster]</font>
 And
 Angle Offset
 B-C-E     BJT
 Background
-Bi-Color LED 2-pin
-Bi-Color LED 3-pin
-Bias Pot 1 <font color='gray'>[DLH]</font>
 Box
 C-B-E     BJT
 Circle
@@ -97,8 +90,6 @@ English
 Español
 Filament Voltage
 Français
-Fuse Holder
-Fuse Holder 2 <font color='gray'>[DLH]</font>
 G-D-S     JFET
 G-D-S     MOSFET
 G-O-I     REGULATOR
@@ -107,12 +98,9 @@ G-S-D     MOSFET
 Generate DIYLC Netlist (excl. Switches)
 Generate DIYLC Netlist (incl. Switches)
 Gray
-Ground Verical <font color='gray'>[DLH]</font>
 Humbucking - 4 leads
 I-G-O     REGULATOR
 Italiano
-Jack 11 <font color='gray'>[DLH]</font>
-Jack 12A <font color='gray'>[DLH]</font>
 Lin
 Log
 Markers
@@ -138,10 +126,7 @@ PCB
 PNP
 Poles
 Português
-Q Pad H
-R Pad
 Rectangle
-Relay 1 - H <font color='gray'>[DLH]</font>
 Rev log
 S-G-D     JFET
 S-G-D     MOSFET
@@ -162,14 +147,9 @@ Source Style
 Source Type
 Srpski
 Stroke
-Switch DPDT <font color='gray'>[DLH]</font>
-Switch SPDT <font color='gray'>[DLH]</font>
-TO-92 w/ 2 Leads
-TO-92 w/ 3 Leads
 Ten
 Terminal
 Timing
-Title Block
 Tubular Beveled
 Xnor
 Xor
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
index 06dcb04c..a866b0c1 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
@@ -93,6 +93,7 @@ public class CanvasPlugin implements IPlugIn{
     scroll.getHorizontalScrollBar().setValue((totalSize.width - visibleSize.width) / 2);
     scroll.getVerticalScrollBar().setValue((totalSize.height - visibleSize.height) / 2);
     getScrollPane().getViewport().setVisible(true);
+    updateZeroLocation();
   }
 
   @Override
@@ -473,6 +474,8 @@ public class CanvasPlugin implements IPlugIn{
               
               canvasPanel.scrollRectToVisible(visibleRect);
               canvasPanel.revalidate();
+              
+              updateZeroLocation();
             }
           });
         }