Commit patch fixing an issue in pan with middle mouse button (from lajos kamocsay) (add53213) · Commits · Elphel / kicad-source-mirror

common/drawframe.cpp

+2 −10

Original line number	Diff line number	Diff line
		@@ -575,7 +575,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition )
		else
		virtualSize.x = logicalClientRect.width;
		}
		else if( logicalClientRect.width < drawingRect.width )
		else
		{
		if( drawingCenterX > clientCenterX )
		virtualSize.x = drawingRect.width +
		@@ -586,10 +586,6 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition )
		else
		virtualSize.x = drawingRect.width;
		}
		else
		{
		virtualSize.x = drawingRect.width;
		}
		}

		if( drawingRect.GetTop() < logicalClientRect.GetTop() && drawingRect.GetBottom() > logicalClientRect.GetBottom() )
		@@ -610,7 +606,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition )
		else
		virtualSize.y = logicalClientRect.height;
		}
		else if( logicalClientRect.height < drawingRect.height )
		else
		{
		if( drawingCenterY > clientCenterY )
		virtualSize.y = drawingRect.height +
		@@ -621,10 +617,6 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition )
		else
		virtualSize.y = drawingRect.height;
		}
		else
		{
		virtualSize.y = drawingRect.height;
		}
		}
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -145,9 +145,13 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
		bSizer2->Add( m_checkShowHiddenPins, 0, wxALL\|wxEXPAND, 3 );

		m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Enable middle mouse button panning"), wxDefaultPosition, wxDefaultSize, 0 );
		m_checkEnableMiddleButtonPan->SetToolTip( _("Use middle mouse button dragging to pan") );

		bSizer2->Add( m_checkEnableMiddleButtonPan, 0, wxALL, 3 );

		m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("Middle mouse button panning limited by current toolbar panning"), wxDefaultPosition, wxDefaultSize, 0 );
		m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("Middle mouse button panning limited"), wxDefaultPosition, wxDefaultSize, 0 );
		m_checkMiddleButtonPanLimited->SetToolTip( _("Middle mouse button panning limited by current scrollbar size") );

		bSizer2->Add( m_checkMiddleButtonPanLimited, 0, wxALL, 3 );

		m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Enable automatic &panning"), wxDefaultPosition, wxDefaultSize, 0 );

+3 −3

Original line number	Diff line number	Diff line
		@@ -2533,7 +2533,7 @@
		<property name="style"></property>
		<property name="subclass"></property>
		<property name="toolbar_pane">0</property>
		<property name="tooltip"></property>
		<property name="tooltip">Use middle mouse button dragging to pan</property>
		<property name="validator_data_type"></property>
		<property name="validator_style">wxFILTER_NONE</property>
		<property name="validator_type">wxDefaultValidator</property>
		@@ -2600,7 +2600,7 @@
		<property name="gripper">0</property>
		<property name="hidden">0</property>
		<property name="id">wxID_ANY</property>
		<property name="label">Middle mouse button panning limited by current toolbar panning</property>
		<property name="label">Middle mouse button panning limited</property>
		<property name="max_size"></property>
		<property name="maximize_button">0</property>
		<property name="maximum_size"></property>
		@@ -2621,7 +2621,7 @@
		<property name="style"></property>
		<property name="subclass"></property>
		<property name="toolbar_pane">0</property>
		<property name="tooltip"></property>
		<property name="tooltip">Middle mouse button panning limited by current scrollbar size</property>
		<property name="validator_data_type"></property>
		<property name="validator_style">wxFILTER_NONE</property>
		<property name="validator_type">wxDefaultValidator</property>

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ void LIB_EDIT_FRAME::OnEditPin( wxCommandEvent& event )
		dlg.SetPadNameTextSize( ReturnStringFromValue( g_UserUnit, pin->GetNumberTextSize() ) );

		dlg.SetPadNameTextSizeUnits( units );
		dlg.SetLength( ReturnStringFromValue( g_UserUnit, pin->GetLength(), m_internalUnits ) );
		dlg.SetLength( ReturnStringFromValue( g_UserUnit, pin->GetLength() ) );
		dlg.SetLengthUnits( units );
		dlg.SetAddToAllParts( pin->GetUnit() == 0 );
		dlg.SetAddToAllBodyStyles( pin->GetConvert() == 0 );

+5 −1

Original line number	Diff line number	Diff line
		@@ -220,9 +220,13 @@ public:

		/**
		* Function GetWxOrientation.
		* @return int - ws' style printing orientation.
		* @return ws' style printing orientation (wxPORTRAIT or wxLANDSCAPE).
		*/
		#if wxCHECK_VERSION( 2, 9, 0 )
		wxPrintOrientation GetWxOrientation() const { return IsPortrait() ? wxPORTRAIT : wxLANDSCAPE; }
		#else
		int GetWxOrientation() const { return IsPortrait() ? wxPORTRAIT : wxLANDSCAPE; }
		#endif

		/**
		* Function GetPaperId