interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented dashing on Windows.

This commit is contained in:
Pietro Gagliardi 2015-10-16 10:46:26 -04:00
parent 1cadb85bd0
commit 8119a69572
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui.h
View File

@ -377,6 +377,7 @@ struct uiDrawBrushGradientStop {
struct uiDrawStrokeParams { struct uiDrawStrokeParams {
uiDrawLineCap Cap; uiDrawLineCap Cap;
uiDrawLineJoin Join; uiDrawLineJoin Join;
// TODO what if this is 0? on windows there will be a crash with dashing
double Thickness; double Thickness;
double MiterLimit; double MiterLimit;
double *Dashes; double *Dashes;

19
windows/draw.c
View File

@ -552,6 +552,8 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *p, uiDrawBrush *b, uiDrawStrokeP
ID2D1Brush *brush; ID2D1Brush *brush;
ID2D1StrokeStyle *style; ID2D1StrokeStyle *style;
D2D1_STROKE_STYLE_PROPERTIES dsp; D2D1_STROKE_STYLE_PROPERTIES dsp;
FLOAT *dashes;
size_t i;
ID2D1Layer *cliplayer; ID2D1Layer *cliplayer;
HRESULT hr; HRESULT hr;
@ -588,14 +590,25 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *p, uiDrawBrush *b, uiDrawStrokeP
break; break;
} }
dsp.dashStyle = D2D1_DASH_STYLE_SOLID; dsp.dashStyle = D2D1_DASH_STYLE_SOLID;
dsp.dashOffset = 0; dashes = NULL;
// note that dash widths and the dash phase are scaled up by the thickness by Direct2D
// TODO be sure to formally document this
if (sp->NumDashes != 0) {
dsp.dashStyle = D2D1_DASH_STYLE_CUSTOM;
dashes = (FLOAT *) uiAlloc(sp->NumDashes * sizeof (FLOAT), "FLOAT[]");
for (i = 0; i < sp->NumDashes; i++)
dashes[i] = sp->Dashes[i] / sp->Thickness;
}
dsp.dashOffset = sp->DashPhase / sp->Thickness;
hr = ID2D1Factory_CreateStrokeStyle(d2dfactory, hr = ID2D1Factory_CreateStrokeStyle(d2dfactory,
&dsp, &dsp,
NULL, dashes,
0, sp->NumDashes,
&style); &style);
if (hr != S_OK) if (hr != S_OK)
logHRESULT("error creating stroke style in uiDrawStroke()", hr); logHRESULT("error creating stroke style in uiDrawStroke()", hr);
if (dashes != NULL)
uiFree(dashes);
cliplayer = applyClip(c); cliplayer = applyClip(c);
ID2D1RenderTarget_DrawGeometry(c->rt, ID2D1RenderTarget_DrawGeometry(c->rt,