AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add 'h' to tri-toggle font hinting

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@1360 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2011-05-18 12:04:31 +00:00
parent bde3c8ed97
commit 09e3baaaf5
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
samplecode/SampleApp.cpp
View File

@ -122,8 +122,9 @@ static SkTriState cycle_tristate(SkTriState state) {
class FlagsDrawFilter : public SkDrawFilter { class FlagsDrawFilter : public SkDrawFilter {
public: public:
FlagsDrawFilter(SkTriState lcd, SkTriState aa, SkTriState filter) : FlagsDrawFilter(SkTriState lcd, SkTriState aa, SkTriState filter,
fLCDState(lcd), fAAState(aa), fFilterState(filter) {} SkTriState hinting) :
fLCDState(lcd), fAAState(aa), fFilterState(filter), fHintingState(hinting) {}
virtual void filter(SkPaint* paint, Type t) { virtual void filter(SkPaint* paint, Type t) {
if (kText_Type == t && kUnknown_SkTriState != fLCDState) { if (kText_Type == t && kUnknown_SkTriState != fLCDState) {
@ -135,12 +136,18 @@ public:
if (kUnknown_SkTriState != fFilterState) { if (kUnknown_SkTriState != fFilterState) {
paint->setFilterBitmap(kTrue_SkTriState == fFilterState); paint->setFilterBitmap(kTrue_SkTriState == fFilterState);
} }
if (kUnknown_SkTriState != fHintingState) {
paint->setHinting(kTrue_SkTriState == fHintingState ?
SkPaint::kNormal_Hinting :
SkPaint::kSlight_Hinting);
}
} }
private: private:
SkTriState fLCDState; SkTriState fLCDState;
SkTriState fAAState; SkTriState fAAState;
SkTriState fFilterState; SkTriState fFilterState;
SkTriState fHintingState;
}; };
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -304,6 +311,7 @@ private:
SkTriState fLCDState; SkTriState fLCDState;
SkTriState fAAState; SkTriState fAAState;
SkTriState fFilterState; SkTriState fFilterState;
SkTriState fHintingState;
unsigned fFlipAxis; unsigned fFlipAxis;
int fScrollTestX, fScrollTestY; int fScrollTestX, fScrollTestY;
@ -435,6 +443,7 @@ SampleWindow::SampleWindow(void* hwnd) : INHERITED(hwnd) {
fLCDState = kUnknown_SkTriState; fLCDState = kUnknown_SkTriState;
fAAState = kUnknown_SkTriState; fAAState = kUnknown_SkTriState;
fFilterState = kUnknown_SkTriState; fFilterState = kUnknown_SkTriState;
fHintingState = kUnknown_SkTriState;
fFlipAxis = 0; fFlipAxis = 0;
fScrollTestX = fScrollTestY = 0; fScrollTestX = fScrollTestY = 0;
@ -857,7 +866,8 @@ void SampleWindow::beforeChild(SkView* child, SkCanvas* canvas) {
canvas->translate(-cx, -cy); canvas->translate(-cx, -cy);
} }
canvas->setDrawFilter(new FlagsDrawFilter(fLCDState, fAAState, fFilterState))->unref(); canvas->setDrawFilter(new FlagsDrawFilter(fLCDState, fAAState,
fFilterState, fHintingState))->unref();
if (fMeasureFPS) { if (fMeasureFPS) {
fMeasureFPS_Time = 0; // 0 means the child is not aware of repeat-draw fMeasureFPS_Time = 0; // 0 means the child is not aware of repeat-draw
@ -1030,6 +1040,11 @@ bool SampleWindow::onHandleChar(SkUnichar uni) {
fRequestGrabImage = true; fRequestGrabImage = true;
this->inval(NULL); this->inval(NULL);
break; break;
case 'h':
fHintingState = cycle_tristate(fHintingState);
this->updateTitle();
this->inval(NULL);
break;
case 'i': case 'i':
this->zoomIn(); this->zoomIn();
break; break;
@ -1283,7 +1298,7 @@ void SampleWindow::updateTitle() {
title.prepend(trystate_str(fLCDState, "LCD ", "lcd ")); title.prepend(trystate_str(fLCDState, "LCD ", "lcd "));
title.prepend(trystate_str(fAAState, "AA ", "aa ")); title.prepend(trystate_str(fAAState, "AA ", "aa "));
title.prepend(trystate_str(fFilterState, "LERP ", "lerp ")); title.prepend(trystate_str(fFilterState, "H ", "h "));
title.prepend(fFlipAxis & kFlipAxis_X ? "X " : NULL); title.prepend(fFlipAxis & kFlipAxis_X ? "X " : NULL);
title.prepend(fFlipAxis & kFlipAxis_Y ? "Y " : NULL); title.prepend(fFlipAxis & kFlipAxis_Y ? "Y " : NULL);