haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eeschema-gal: temporarily disable scrollbar code (causes crashes after Jeff's changes)

This commit is contained in:
Tomasz Wlostowski 2018-08-27 15:24:44 +02:00 committed by Jeff Young
parent b604f007d7
commit d9f0dc63a5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/eda_dockart.cpp
View File

@ -24,8 +24,8 @@
#include <eda_dockart.h> #include <eda_dockart.h>
#include <wx/aui/tabart.h> #include <wx/aui/tabart.h>
#include <wx/aui/auibook.h> #include <wx/aui/auibook.h>
#include <class_draw_panel_gal.h> //#include <class_draw_panel_gal.h>
#include <class_drawpanel.h> //#include <class_drawpanel.h>
#include <draw_frame.h> #include <draw_frame.h>
void EDA_DOCKART::DrawBorder( wxDC& aDC, wxWindow* aWindow, const wxRect& aRect, void EDA_DOCKART::DrawBorder( wxDC& aDC, wxWindow* aWindow, const wxRect& aRect,
@ -54,9 +54,10 @@ void EDA_DOCKART::DrawBorder( wxDC& aDC, wxWindow* aWindow, const wxRect& aRect,
// This achieves a right-bottom-bordered canvas, which works reasonably well with // This achieves a right-bottom-bordered canvas, which works reasonably well with
// wxWidgets right-bottom bordered toolbars. // wxWidgets right-bottom bordered toolbars.
wxWindow* window = m_frame->GetCanvas(); //wxWindow* window = reinterpret_cast<wxWindow*>( m_frame->GetCanvas() );
wxSize scrollbarSize = window->GetSize() - window->GetClientSize(); //wxSize scrollbarSize = window->GetSize() - window->GetClientSize();
// Not sure why it takes a pen twice as wide as the border to fill it in, but it does. // Not sure why it takes a pen twice as wide as the border to fill it in, but it does.
#if 0
int borderWidth = GetMetric( wxAUI_DOCKART_PANE_BORDER_SIZE ) * 2; int borderWidth = GetMetric( wxAUI_DOCKART_PANE_BORDER_SIZE ) * 2;
int borderAdjust = borderWidth; int borderAdjust = borderWidth;
@ -85,6 +86,7 @@ void EDA_DOCKART::DrawBorder( wxDC& aDC, wxWindow* aWindow, const wxRect& aRect,
aDC.DrawLine( r.x + r.width, r.y, r.x + r.width, r.y + r.height - 1 ); aDC.DrawLine( r.x + r.width, r.y, r.x + r.width, r.y + r.height - 1 );
// bottom // bottom
aDC.DrawLine( r.x, r.y + r.height - 1, r.x + r.width - 1, r.y + r.height - 1 ); aDC.DrawLine( r.x, r.y + r.height - 1, r.x + r.width - 1, r.y + r.height - 1 );
#endif
} }
else else
{ {