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

Remove shadowing linewidth member from the Cairo GAL 

The base GAL has the linewidth property already, and its
accessor will only return the base version. This was causing
problems with the Cairo printing GAL, since that setter wasn't
using the base class version. Also, this removes the print-specific
setter, since the actual setting of line width shouldn't be done
there and is instead done where the drawing happens.

Fixes https://gitlab.com/kicad/code/kicad/issues/5089
This commit is contained in:
Ian McInerney 2020-08-08 00:47:16 +01:00
parent f36c158696
commit 5684708b22
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/gal/cairo/cairo_print.cpp
View File

@ -141,14 +141,6 @@ CAIRO_PRINT_GAL::CAIRO_PRINT_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions,
} }
void CAIRO_PRINT_GAL::SetLineWidth( float aLineWidth )
{
storePath();
lineWidth = aLineWidth;
cairo_set_line_width( currentContext, aLineWidth );
}
void CAIRO_PRINT_GAL::ComputeWorldScreenMatrix() void CAIRO_PRINT_GAL::ComputeWorldScreenMatrix()
{ {
worldScale = screenDPI * worldUnitLength * zoomFactor; worldScale = screenDPI * worldUnitLength * zoomFactor;

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

@ -292,7 +292,6 @@ protected:
unsigned int groupCounter; ///< Counter used for generating keys for groups unsigned int groupCounter; ///< Counter used for generating keys for groups
GROUP* currentGroup; ///< Currently used group GROUP* currentGroup; ///< Currently used group
double lineWidth;
double linePixelWidth; double linePixelWidth;
double lineWidthInPixels; double lineWidthInPixels;
bool lineWidthIsOdd; bool lineWidthIsOdd;

2
include/gal/cairo/cairo_print.h
View File

@ -82,8 +82,6 @@ public:
CAIRO_PRINT_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, CAIRO_PRINT_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions,
std::unique_ptr<CAIRO_PRINT_CTX> aContext ); std::unique_ptr<CAIRO_PRINT_CTX> aContext );
void SetLineWidth( float aLineWidth ) override;
void ComputeWorldScreenMatrix() override; void ComputeWorldScreenMatrix() override;
GAL* GetGAL() override GAL* GetGAL() override