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

Remove not used cursor fields & methods in Cairo GAL

This commit is contained in:
Maciej Suminski 2017-03-22 10:37:43 +01:00
parent b8edecc10f
commit ddf4f3b2bc
2 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
common/gal/cairo/cairo_gal.cpp
View File

@ -55,7 +55,6 @@ CAIRO_GAL::CAIRO_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions,
// Initialize the flags // Initialize the flags
isGrouping = false; isGrouping = false;
isInitialized = false; isInitialized = false;
isDeleteSavedPixels = false;
validCompositor = false; validCompositor = false;
groupCounter = 0; groupCounter = 0;
@ -81,10 +80,6 @@ CAIRO_GAL::CAIRO_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions,
SetSize( aParent->GetSize() ); SetSize( aParent->GetSize() );
screenSize = VECTOR2I( aParent->GetSize() ); screenSize = VECTOR2I( aParent->GetSize() );
cursorPixels = NULL;
cursorPixelsSaved = NULL;
initCursor();
// Grid color settings are different in Cairo and OpenGL // Grid color settings are different in Cairo and OpenGL
SetGridColor( COLOR4D( 0.1, 0.1, 0.1, 0.8 ) ); SetGridColor( COLOR4D( 0.1, 0.1, 0.1, 0.8 ) );
SetAxesColor( COLOR4D( BLUE ) ); SetAxesColor( COLOR4D( BLUE ) );
@ -99,9 +94,6 @@ CAIRO_GAL::~CAIRO_GAL()
deinitSurface(); deinitSurface();
deleteBitmaps(); deleteBitmaps();
delete cursorPixels;
delete cursorPixelsSaved;
ClearCache(); ClearCache();
} }
@ -112,7 +104,6 @@ bool CAIRO_GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions )
if( super::updatedGalDisplayOptions( aOptions ) ) if( super::updatedGalDisplayOptions( aOptions ) )
{ {
initCursor();
Refresh(); Refresh();
refresh = true; refresh = true;
} }
@ -950,35 +941,6 @@ void CAIRO_GAL::skipMouseEvent( wxMouseEvent& aEvent )
} }
void CAIRO_GAL::initCursor()
{
if( cursorPixels )
delete cursorPixels;
if( cursorPixelsSaved )
delete cursorPixelsSaved;
const int cursorSize = fullscreenCursor ? 8000 : 80;
cursorPixels = new wxBitmap( cursorSize, cursorSize );
cursorPixelsSaved = new wxBitmap( cursorSize, cursorSize );
wxMemoryDC cursorShape( *cursorPixels );
const auto cColor = getCursorColor();
cursorShape.SetBackground( *wxTRANSPARENT_BRUSH );
wxColour color( cColor.r * cColor.a * 255, cColor.g * cColor.a * 255,
cColor.b * cColor.a * 255, 255 );
wxPen pen = wxPen( color );
cursorShape.SetPen( pen );
cursorShape.Clear();
cursorShape.DrawLine( 0, cursorSize / 2, cursorSize, cursorSize / 2 );
cursorShape.DrawLine( cursorSize / 2, 0, cursorSize / 2, cursorSize );
}
void CAIRO_GAL::blitCursor( wxMemoryDC& clientDC ) void CAIRO_GAL::blitCursor( wxMemoryDC& clientDC )
{ {
if( !IsCursorEnabled() ) if( !IsCursorEnabled() )
@ -1059,7 +1021,6 @@ void CAIRO_GAL::initSurface()
lineWidth = 0; lineWidth = 0;
isDeleteSavedPixels = true;
isInitialized = true; isInitialized = true;
} }

12
include/gal/cairo/cairo_gal.h
View File

@ -292,13 +292,6 @@ private:
unsigned int bufferSize; ///< Size of buffers cairoOutput, bitmapBuffers unsigned int bufferSize; ///< Size of buffers cairoOutput, bitmapBuffers
unsigned char* wxOutput; ///< wxImage comaptible buffer unsigned char* wxOutput; ///< wxImage comaptible buffer
// Cursor variables
std::deque<wxColour> savedCursorPixels; ///< Saved pixels of the cursor
bool isDeleteSavedPixels; ///< True, if the saved pixels can be discarded
wxPoint savedCursorPosition; ///< The last cursor position
wxBitmap* cursorPixels; ///< Cursor pixels
wxBitmap* cursorPixelsSaved; ///< Saved cursor pixels
/// Maximum number of arguments for one command /// Maximum number of arguments for one command
static const int MAX_CAIRO_ARGUMENTS = 4; static const int MAX_CAIRO_ARGUMENTS = 4;
@ -376,11 +369,6 @@ private:
*/ */
void skipMouseEvent( wxMouseEvent& aEvent ); void skipMouseEvent( wxMouseEvent& aEvent );
/**
* @brief Prepares cursor bitmap.
*/
virtual void initCursor();
/** /**
* @brief Blits cursor into the current screen. * @brief Blits cursor into the current screen.
*/ */