From f18807ea0fc38d364af9047e931aa58540e2727c Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Wed, 22 May 2019 10:04:34 +0200
Subject: [PATCH] Eeschema: Ensure axis are always drawn in libedit and viewlib

Fixes: lp:1822408
https://bugs.launchpad.net/kicad/+bug/1822408
---
 eeschema/libedit/lib_edit_frame.cpp   | 4 ++++
 eeschema/tools/sch_editor_control.cpp | 2 +-
 eeschema/viewlib_frame.cpp            | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/eeschema/libedit/lib_edit_frame.cpp b/eeschema/libedit/lib_edit_frame.cpp
index f9c0cd8bf6..5e7925d202 100644
--- a/eeschema/libedit/lib_edit_frame.cpp
+++ b/eeschema/libedit/lib_edit_frame.cpp
@@ -183,6 +183,10 @@ LIB_EDIT_FRAME::LIB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
 
     LoadSettings( config() );
 
+    // Ensure axis are always drawn
+    KIGFX::GAL_DISPLAY_OPTIONS& gal_opts = GetGalDisplayOptions();
+    gal_opts.m_axesEnabled = true;
+
     m_dummyScreen = new SCH_SCREEN( aKiway );
     SetScreen( m_dummyScreen );
     GetScreen()->m_Center = true;
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index d0029f418e..5feaf6dbfe 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -88,7 +88,7 @@ TOOL_ACTION EE_ACTIONS::editWithLibEdit( "eeschema.EditorControl.editWithSymbolE
 
 TOOL_ACTION EE_ACTIONS::showLibraryBrowser( "eeschema.EditorControl.showLibraryBrowser",
         AS_GLOBAL, 0,
-        _( "Symbol Library Browser" ), "",
+        _( "Symbol Library Browser" ), _( "Browse symbol libraries" ),
         library_browse_xpm );
 
 TOOL_ACTION EE_ACTIONS::enterSheet( "eeschema.EditorControl.enterSheet",
diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index c0e4d77b1a..9263d57517 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -136,6 +136,10 @@ LIB_VIEW_FRAME::LIB_VIEW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
     GetScreen()->m_Center = true;      // Axis origin centered on screen.
     LoadSettings( config() );
 
+    // Ensure axis are always drawn (initial default display was not drawn)
+    KIGFX::GAL_DISPLAY_OPTIONS& gal_opts = GetGalDisplayOptions();
+    gal_opts.m_axesEnabled = true;
+
     SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
 
     setupTools();