Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Special case up-key so it can get past headers in paged dialogs. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10078
7.0
Jeff Young 3 years ago
parent
cb6b2da55f
commit
f87bf3c46d
6 changed files with 58 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 53
      common/widgets/paged_dialog.cpp
  2. 8
      eeschema/dialogs/dialog_schematic_setup.cpp
  3. 6
      eeschema/dialogs/dialog_schematic_setup.h
  4. 15
      include/widgets/paged_dialog.h
  5. 6
      pcbnew/dialogs/dialog_board_setup.cpp
  6. 6
      pcbnew/dialogs/dialog_board_setup.h

53
common/widgets/paged_dialog.cpp
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2019-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@ -45,8 +45,7 @@ PAGED_DIALOG::PAGED_DIALOG( wxWindow* aParent, const wxString& aTitle, bool aSho
m_auxiliaryButton( nullptr ),
m_resetButton( nullptr ),
m_cancelButton( nullptr ),
m_title( aTitle ),
m_dirty( false )
m_title( aTitle )
{
auto mainSizer = new wxBoxSizer( wxVERTICAL );
SetSizer( mainSizer );
@ -97,17 +96,18 @@ PAGED_DIALOG::PAGED_DIALOG( wxWindow* aParent, const wxString& aTitle, bool aSho
if( m_auxiliaryButton )
{
m_auxiliaryButton->Bind( wxEVT_COMMAND_BUTTON_CLICKED, &PAGED_DIALOG::OnAuxiliaryAction,
m_auxiliaryButton->Bind( wxEVT_COMMAND_BUTTON_CLICKED, &PAGED_DIALOG::onAuxiliaryAction,
this );
}
if( m_resetButton )
{
m_resetButton->Bind( wxEVT_COMMAND_BUTTON_CLICKED, &PAGED_DIALOG::OnResetButton, this );
m_resetButton->Bind( wxEVT_COMMAND_BUTTON_CLICKED, &PAGED_DIALOG::onResetButton, this );
}
m_treebook->Bind( wxEVT_TREEBOOK_PAGE_CHANGED, &PAGED_DIALOG::OnPageChanged, this );
m_treebook->Bind( wxEVT_TREEBOOK_PAGE_CHANGING, &PAGED_DIALOG::OnPageChanging, this );
m_treebook->Bind( wxEVT_CHAR_HOOK, &PAGED_DIALOG::onCharHook, this );
m_treebook->Bind( wxEVT_TREEBOOK_PAGE_CHANGED, &PAGED_DIALOG::onPageChanged, this );
m_treebook->Bind( wxEVT_TREEBOOK_PAGE_CHANGING, &PAGED_DIALOG::onPageChanging, this );
}
@ -160,17 +160,18 @@ PAGED_DIALOG::~PAGED_DIALOG()
if( m_auxiliaryButton )
{
m_auxiliaryButton->Unbind( wxEVT_COMMAND_BUTTON_CLICKED, &PAGED_DIALOG::OnAuxiliaryAction,
m_auxiliaryButton->Unbind( wxEVT_COMMAND_BUTTON_CLICKED, &PAGED_DIALOG::onAuxiliaryAction,
this );
}
if( m_resetButton )
{
m_resetButton->Unbind( wxEVT_COMMAND_BUTTON_CLICKED, &PAGED_DIALOG::OnResetButton, this );
m_resetButton->Unbind( wxEVT_COMMAND_BUTTON_CLICKED, &PAGED_DIALOG::onResetButton, this );
}
m_treebook->Unbind( wxEVT_TREEBOOK_PAGE_CHANGED, &PAGED_DIALOG::OnPageChanged, this );
m_treebook->Unbind( wxEVT_TREEBOOK_PAGE_CHANGING, &PAGED_DIALOG::OnPageChanging, this );
m_treebook->Unbind( wxEVT_CHAR_HOOK, &PAGED_DIALOG::onCharHook, this );
m_treebook->Unbind( wxEVT_TREEBOOK_PAGE_CHANGED, &PAGED_DIALOG::onPageChanged, this );
m_treebook->Unbind( wxEVT_TREEBOOK_PAGE_CHANGING, &PAGED_DIALOG::onPageChanging, this );
}
@ -330,7 +331,31 @@ void PAGED_DIALOG::UpdateResetButton( int aPage )
}
void PAGED_DIALOG::OnPageChanged( wxBookCtrlEvent& event )
void PAGED_DIALOG::onCharHook( wxKeyEvent& aEvent )
{
if( aEvent.GetKeyCode() == WXK_UP )
{
// We have to special-case WXK_UP as when wxWidgets attempts to select the header we'll
// go down to its first child again.
int page = m_treebook->GetSelection();
if( page >= 1 )
{
if( m_treebook->GetPage( page - 1 )->GetChildren().IsEmpty() )
m_treebook->SetSelection( std::max( page - 2, 0 ) );
else
m_treebook->SetSelection( page - 1 );
}
}
else
{
aEvent.Skip();
}
}
void PAGED_DIALOG::onPageChanged( wxBookCtrlEvent& event )
{
int page = event.GetSelection();
@ -351,7 +376,7 @@ void PAGED_DIALOG::OnPageChanged( wxBookCtrlEvent& event )
}
void PAGED_DIALOG::OnPageChanging( wxBookCtrlEvent& aEvent )
void PAGED_DIALOG::onPageChanging( wxBookCtrlEvent& aEvent )
{
int currentPage = aEvent.GetOldSelection();
@ -371,7 +396,7 @@ void PAGED_DIALOG::OnPageChanging( wxBookCtrlEvent& aEvent )
}
void PAGED_DIALOG::OnResetButton( wxCommandEvent& aEvent )
void PAGED_DIALOG::onResetButton( wxCommandEvent& aEvent )
{
int sel = m_treebook->GetSelection();

8
eeschema/dialogs/dialog_schematic_setup.cpp
View File

@ -105,18 +105,18 @@ DIALOG_SCHEMATIC_SETUP::~DIALOG_SCHEMATIC_SETUP()
}
void DIALOG_SCHEMATIC_SETUP::OnPageChanged( wxBookCtrlEvent& event )
void DIALOG_SCHEMATIC_SETUP::onPageChanged( wxBookCtrlEvent& aEvent )
{
PAGED_DIALOG::OnPageChanged( event );
PAGED_DIALOG::onPageChanged( aEvent );
int page = event.GetSelection();
int page = aEvent.GetSelection();
if( Prj().IsReadOnly() )
KIUI::Disable( m_treebook->GetPage( page ) );
}
void DIALOG_SCHEMATIC_SETUP::OnAuxiliaryAction( wxCommandEvent& event )
void DIALOG_SCHEMATIC_SETUP::onAuxiliaryAction( wxCommandEvent& event )
{
DIALOG_SCH_IMPORT_SETTINGS importDlg( this, m_frame );

6
eeschema/dialogs/dialog_schematic_setup.h
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@ -42,8 +42,8 @@ public:
protected:
// event handlers
void OnPageChanged( wxBookCtrlEvent& aEvent ) override;
void OnAuxiliaryAction( wxCommandEvent& aEvent ) override;
void onPageChanged( wxBookCtrlEvent& aEvent ) override;
void onAuxiliaryAction( wxCommandEvent& aEvent ) override;
SCH_EDIT_FRAME* m_frame;

15
include/widgets/paged_dialog.h
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2017-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@ -54,12 +54,11 @@ protected:
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
void OnClose( wxCloseEvent& event );
void OnCancel( wxCommandEvent& event );
virtual void OnAuxiliaryAction( wxCommandEvent& event ) { event.Skip(); }
void OnResetButton( wxCommandEvent& aEvent );
virtual void OnPageChanged( wxBookCtrlEvent& event );
virtual void OnPageChanging( wxBookCtrlEvent& aEvent );
virtual void onAuxiliaryAction( wxCommandEvent& aEvent ) { aEvent.Skip(); }
virtual void onResetButton( wxCommandEvent& aEvent );
virtual void onPageChanged( wxBookCtrlEvent& aEvent );
virtual void onPageChanging( wxBookCtrlEvent& aEvent );
virtual void onCharHook( wxKeyEvent& aEvent );
wxTreebook* m_treebook;
wxButton* m_auxiliaryButton;
@ -70,8 +69,6 @@ protected:
private:
wxString m_title;
bool m_dirty;
wxBoxSizer* m_buttonsSizer;
};

6
pcbnew/dialogs/dialog_board_setup.cpp
View File

@ -136,9 +136,9 @@ DIALOG_BOARD_SETUP::~DIALOG_BOARD_SETUP()
}
void DIALOG_BOARD_SETUP::OnPageChanged( wxBookCtrlEvent& aEvent )
void DIALOG_BOARD_SETUP::onPageChanged( wxBookCtrlEvent& aEvent )
{
PAGED_DIALOG::OnPageChanged( aEvent );
PAGED_DIALOG::onPageChanged( aEvent );
int page = aEvent.GetSelection();
@ -155,7 +155,7 @@ void DIALOG_BOARD_SETUP::OnPageChanged( wxBookCtrlEvent& aEvent )
}
void DIALOG_BOARD_SETUP::OnAuxiliaryAction( wxCommandEvent& aEvent )
void DIALOG_BOARD_SETUP::onAuxiliaryAction( wxCommandEvent& aEvent )
{
DIALOG_IMPORT_SETTINGS importDlg( this, m_frame );

6
pcbnew/dialogs/dialog_board_setup.h
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2017-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@ -46,8 +46,8 @@ public:
protected:
// event handlers
void OnPageChanged( wxBookCtrlEvent& aEvent ) override;
void OnAuxiliaryAction( wxCommandEvent& aEvent ) override;
void onPageChanged( wxBookCtrlEvent& aEvent ) override;
void onAuxiliaryAction( wxCommandEvent& aEvent ) override;
PCB_EDIT_FRAME* m_frame;

Write Preview
Loading…
Cancel
Save