From d7a3c35f56b4a769ee0ef92b8b9bb5c9f8ae679f Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 29 Aug 2023 12:20:59 +0100 Subject: [PATCH] Repair over-zealous application of grid origin dialog. Fixes https://gitlab.com/kicad/code/kicad/-/issues/15537 --- eeschema/symbol_editor/toolbars_symbol_editor.cpp | 1 - eeschema/toolbars_sch_editor.cpp | 1 - pagelayout_editor/toolbars_pl_editor.cpp | 1 - 3 files changed, 3 deletions(-) diff --git a/eeschema/symbol_editor/toolbars_symbol_editor.cpp b/eeschema/symbol_editor/toolbars_symbol_editor.cpp index f29d6b0dc4..a4fdbf76d5 100644 --- a/eeschema/symbol_editor/toolbars_symbol_editor.cpp +++ b/eeschema/symbol_editor/toolbars_symbol_editor.cpp @@ -177,7 +177,6 @@ void SYMBOL_EDIT_FRAME::ReCreateOptToolbar() EE_SELECTION_TOOL* selTool = m_toolManager->GetTool(); std::unique_ptr gridMenu = std::make_unique( false, selTool ); gridMenu->Add( ACTIONS::gridProperties ); - gridMenu->Add( ACTIONS::gridOrigin ); m_optionsToolBar->AddToolContextMenu( ACTIONS::toggleGrid, std::move( gridMenu ) ); m_optionsToolBar->Realize(); diff --git a/eeschema/toolbars_sch_editor.cpp b/eeschema/toolbars_sch_editor.cpp index 2c1598b67b..512c9f6bc6 100644 --- a/eeschema/toolbars_sch_editor.cpp +++ b/eeschema/toolbars_sch_editor.cpp @@ -223,7 +223,6 @@ void SCH_EDIT_FRAME::ReCreateOptToolbar() EE_SELECTION_TOOL* selTool = m_toolManager->GetTool(); std::unique_ptr gridMenu = std::make_unique( false, selTool ); gridMenu->Add( ACTIONS::gridProperties ); - gridMenu->Add( ACTIONS::gridOrigin ); m_optionsToolBar->AddToolContextMenu( ACTIONS::toggleGrid, std::move( gridMenu ) ); m_optionsToolBar->KiRealize(); diff --git a/pagelayout_editor/toolbars_pl_editor.cpp b/pagelayout_editor/toolbars_pl_editor.cpp index 5e39ae9792..042a4a2dcd 100644 --- a/pagelayout_editor/toolbars_pl_editor.cpp +++ b/pagelayout_editor/toolbars_pl_editor.cpp @@ -174,7 +174,6 @@ void PL_EDITOR_FRAME::ReCreateOptToolbar() PL_SELECTION_TOOL* selTool = m_toolManager->GetTool(); std::unique_ptr gridMenu = std::make_unique( false, selTool ); gridMenu->Add( ACTIONS::gridProperties ); - gridMenu->Add( ACTIONS::gridOrigin ); m_optionsToolBar->AddToolContextMenu( ACTIONS::toggleGrid, std::move( gridMenu ) ); m_optionsToolBar->Add( ACTIONS::toggleGrid, ACTION_TOOLBAR::TOGGLE );