tools/skui: put all enums in a common namespace
Change-Id: Icd331e8946d80652750b8b6ea0db65f5f676ac3e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/238058
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/samplecode/PerlinPatch.cpp b/samplecode/PerlinPatch.cpp
index 1e036d7..43dce62 100644
--- a/samplecode/PerlinPatch.cpp
+++ b/samplecode/PerlinPatch.cpp
@@ -10,7 +10,7 @@
#include "include/effects/SkPerlinNoiseShader.h"
#include "samplecode/Sample.h"
#include "src/utils/SkPatchUtils.h"
-#include "tools/ModifierKey.h"
+#include "tools/skui/ModifierKey.h"
static void draw_control_points(SkCanvas* canvas, const SkPoint cubics[12]) {
//draw control points
@@ -167,12 +167,12 @@
return SkPoint::Length(pt.fX - x, pt.fY - y) < SkIntToScalar(5);
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
- modi &= ~ModifierKey::kFirstPress; // ignore this
- if (ModifierKey::kShift == modi) {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
+ modi &= ~skui::ModifierKey::kFirstPress; // ignore this
+ if (skui::ModifierKey::kShift == modi) {
return new PtClick(-1);
}
- if (ModifierKey::kControl == modi) {
+ if (skui::ModifierKey::kControl == modi) {
return new PtClick(-2);
}
SkPoint clickPoint = {x, y};
diff --git a/samplecode/Sample.cpp b/samplecode/Sample.cpp
index e79313d..ab655b1 100644
--- a/samplecode/Sample.cpp
+++ b/samplecode/Sample.cpp
@@ -61,9 +61,9 @@
////////////////////////////////////////////////////////////////////////////
-bool Sample::mouse(SkPoint point, InputState clickState, ModifierKey modifierKeys) {
+bool Sample::mouse(SkPoint point, skui::InputState clickState, skui::ModifierKey modifierKeys) {
switch (clickState) {
- case InputState::kDown:
+ case skui::InputState::kDown:
fClick = nullptr;
if (point.x() < 0 || point.y() < 0 || point.x() >= fWidth || point.y() >= fHeight) {
return false;
@@ -73,24 +73,24 @@
return false;
}
fClick->fPrev = fClick->fCurr = fClick->fOrig = point;
- fClick->fState = InputState::kDown;
+ fClick->fState = skui::InputState::kDown;
fClick->fModifierKeys = modifierKeys;
this->onClick(fClick.get());
return true;
- case InputState::kMove:
+ case skui::InputState::kMove:
if (fClick) {
fClick->fPrev = fClick->fCurr;
fClick->fCurr = point;
- fClick->fState = InputState::kMove;
+ fClick->fState = skui::InputState::kMove;
fClick->fModifierKeys = modifierKeys;
return this->onClick(fClick.get());
}
return false;
- case InputState::kUp:
+ case skui::InputState::kUp:
if (fClick) {
fClick->fPrev = fClick->fCurr;
fClick->fCurr = point;
- fClick->fState = InputState::kUp;
+ fClick->fState = skui::InputState::kUp;
fClick->fModifierKeys = modifierKeys;
bool result = this->onClick(fClick.get());
fClick = nullptr;
@@ -106,7 +106,7 @@
void Sample::onSizeChange() {}
-Sample::Click* Sample::onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) {
+Sample::Click* Sample::onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) {
return nullptr;
}
diff --git a/samplecode/Sample.h b/samplecode/Sample.h
index c22c753..d6ccf48 100644
--- a/samplecode/Sample.h
+++ b/samplecode/Sample.h
@@ -13,10 +13,10 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkString.h"
#include "include/private/SkMacros.h"
-#include "tools/InputState.h"
-#include "tools/ModifierKey.h"
#include "tools/Registry.h"
#include "tools/SkMetaData.h"
+#include "tools/skui/InputState.h"
+#include "tools/skui/ModifierKey.h"
class SkCanvas;
class Sample;
@@ -59,11 +59,11 @@
SkPoint fOrig = {0, 0};
SkPoint fPrev = {0, 0};
SkPoint fCurr = {0, 0};
- InputState fState = InputState::kDown;
- ModifierKey fModifierKeys = ModifierKey::kNone;
+ skui::InputState fState = skui::InputState::kDown;
+ skui::ModifierKey fModifierKeys = skui::ModifierKey::kNone;
SkMetaData fMeta;
};
- bool mouse(SkPoint point, InputState clickState, ModifierKey modifierKeys);
+ bool mouse(SkPoint point, skui::InputState clickState, skui::ModifierKey modifierKeys);
void setBGColor(SkColor color) { fBGColor = color; }
bool animate(double nanos) { return this->onAnimate(nanos); }
@@ -75,7 +75,7 @@
virtual void onSizeChange();
/** Override this if you might handle the click */
- virtual Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi);
+ virtual Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi);
/** Override to track clicks. Return true as long as you want to track the pen/mouse. */
virtual bool onClick(Click*);
diff --git a/samplecode/SampleAAGeometry.cpp b/samplecode/SampleAAGeometry.cpp
index 5086f97..b2aa97d 100644
--- a/samplecode/SampleAAGeometry.cpp
+++ b/samplecode/SampleAAGeometry.cpp
@@ -889,8 +889,8 @@
return true;
}
- void savePath(InputState state) {
- if (state != InputState::kDown) {
+ void savePath(skui::InputState state) {
+ if (state != skui::InputState::kDown) {
return;
}
if (fUndo && fUndo->fPath == fPath) {
@@ -1604,7 +1604,7 @@
return -1;
}
- virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
SkPoint pt = {x, y};
int ptHit = hittest_pt(pt);
if (ptHit >= 0) {
@@ -1679,7 +1679,7 @@
fWeightControl.fVisible = myClick->fVerb == SkPath::kConic_Verb;
} break;
case MyClick::kControlType: {
- if (click->fState != InputState::kDown && myClick->isButton()) {
+ if (click->fState != skui::InputState::kDown && myClick->isButton()) {
return true;
}
switch (myClick->fControl) {
@@ -1819,7 +1819,7 @@
Button* button = kButtonList[index].fButton;
if (button->fVisible && uni == button->fLabel) {
MyClick click(MyClick::kControlType, kButtonList[index].fButtonType);
- click.fState = InputState::kDown;
+ click.fState = skui::InputState::kDown;
(void) this->onClick(&click);
return true;
}
@@ -1835,7 +1835,7 @@
Button* button = kButtonList[index].fButton;
if (button->fVisible && (uni & ~0x20) == (button->fLabel & ~0x20)) {
MyClick click(MyClick::kControlType, kButtonList[index].fButtonType);
- click.fState = InputState::kDown;
+ click.fState = skui::InputState::kDown;
(void) this->onClick(&click);
return true;
}
diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index 9c49db5..8d2804a 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp
@@ -47,7 +47,7 @@
void onOnceBeforeDraw() override { this->updateGpuData(); }
void onDrawContent(SkCanvas*) override;
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override;
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override;
bool onClick(Sample::Click*) override;
bool onChar(SkUnichar) override;
SkString name() override { return SkString("CCPRGeometry"); }
@@ -417,7 +417,7 @@
int fPtIdx;
};
-Sample::Click* CCPRGeometryView::onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) {
+Sample::Click* CCPRGeometryView::onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) {
for (int i = 0; i < 4; ++i) {
if (PrimitiveType::kCubics != fPrimitiveType && 2 == i) {
continue;
diff --git a/samplecode/SampleDegenerateQuads.cpp b/samplecode/SampleDegenerateQuads.cpp
index cadc600..131e119 100644
--- a/samplecode/SampleDegenerateQuads.cpp
+++ b/samplecode/SampleDegenerateQuads.cpp
@@ -380,7 +380,7 @@
}
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override;
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override;
bool onClick(Sample::Click*) override;
bool onChar(SkUnichar) override;
SkString name() override { return SkString("DegenerateQuad"); }
@@ -478,7 +478,7 @@
}
};
-Sample::Click* DegenerateQuadSample::onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) {
+Sample::Click* DegenerateQuadSample::onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) {
SkPoint inCTM = SkPoint::Make((x - kViewOffset) / kViewScale, (y - kViewOffset) / kViewScale);
for (int i = 0; i < 4; ++i) {
if ((fCorners[i] - inCTM).length() < 10.f / kViewScale) {
diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index 385c9e1..f1dcd29 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -468,7 +468,7 @@
}
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
SkPoint pt = { x, y };
int index = -1;
int count = fFB.getTriangle() ? 3 : 2;
diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp
index 76bb048..bec4a7d 100644
--- a/samplecode/SampleHT.cpp
+++ b/samplecode/SampleHT.cpp
@@ -156,7 +156,7 @@
return true;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
// search backwards to find the top-most
for (int i = N - 1; i >= 0; --i) {
if (fArray[i].fDrawable->hitTest(x, y)) {
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index df3b376..a43ac44 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -216,7 +216,7 @@
return true;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
fDoAA = !fDoAA;
return this->INHERITED::onFindClickHandler(x, y, modi);
}
diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index 94913ae..aeddc46 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -217,7 +217,7 @@
return true;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
return new Click();
}
diff --git a/samplecode/SampleLighting.cpp b/samplecode/SampleLighting.cpp
index 6ce9fe3..24a0a64 100644
--- a/samplecode/SampleLighting.cpp
+++ b/samplecode/SampleLighting.cpp
@@ -67,7 +67,7 @@
canvas->drawRect(fRect, paint);
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
return this->INHERITED::onFindClickHandler(x, y, modi);
}
diff --git a/samplecode/SampleLua.cpp b/samplecode/SampleLua.cpp
index 99d486c..1a094bb 100644
--- a/samplecode/SampleLua.cpp
+++ b/samplecode/SampleLua.cpp
@@ -109,7 +109,7 @@
}
virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y,
- ModifierKey modi) override {
+ skui::ModifierKey modi) override {
lua_State* L = this->ensureLua();
lua_getglobal(L, gClickName);
if (lua_isfunction(L, -1)) {
@@ -130,10 +130,10 @@
bool onClick(Click* click) override {
const char* state = nullptr;
switch (click->fState) {
- case InputState::kMove:
+ case skui::InputState::kMove:
state = "moved";
break;
- case InputState::kUp:
+ case skui::InputState::kUp:
state = "up";
break;
default:
diff --git a/samplecode/SampleMixer.cpp b/samplecode/SampleMixer.cpp
index 5998d21..7e39ab1 100644
--- a/samplecode/SampleMixer.cpp
+++ b/samplecode/SampleMixer.cpp
@@ -71,7 +71,7 @@
}
}
- virtual Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+ virtual Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
return fRect.contains(SkScalarRoundToInt(x),
SkScalarRoundToInt(y)) ? new Click() : nullptr;
}
@@ -154,7 +154,7 @@
canvas->restore();
}
- virtual Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+ virtual Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
fMode = (fMode == SkBlendMode::kSrcOver) ? SkBlendMode::kClear : SkBlendMode::kSrcOver;
return fRect.contains(SkScalarRoundToInt(x),
SkScalarRoundToInt(y)) ? new Click() : nullptr;
diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index eba334a..3fd7d3d 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -297,7 +297,7 @@
return SkPoint::Length(pt.fX - x, pt.fY - y) < SkIntToScalar(5);
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
x -= DX;
y -= DY;
for (size_t i = 0; i < SK_ARRAY_COUNT(fPts); i++) {
@@ -396,7 +396,7 @@
// canvas->drawPath(fPath, fSkeletonP);
}
- Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
Click* click = new Click();
fPath.reset();
fPath.moveTo(x, y);
@@ -405,7 +405,7 @@
bool onClick(Click* click) override {
switch (click->fState) {
- case InputState::kMove:
+ case skui::InputState::kMove:
fPath.lineTo(click->fCurr);
fDirty = true;
break;
@@ -484,7 +484,7 @@
this->dodraw(canvas, nullptr, 600, 0, &p);
}
- Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
Click* click = new Click();
fPath.reset();
fPath.moveTo(x, y);
@@ -493,7 +493,7 @@
bool onClick(Click* click) override {
switch (click->fState) {
- case InputState::kMove:
+ case skui::InputState::kMove:
fPath.lineTo(click->fCurr);
break;
default:
diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index 0ca52e9..478f6a0 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp
@@ -189,7 +189,7 @@
return true;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
fShowHairline = !fShowHairline;
return nullptr;
}
@@ -289,7 +289,7 @@
return false;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
const SkScalar tol = 4;
const SkRect r = SkRect::MakeXYWH(x - tol, y - tol, tol * 2, tol * 2);
for (int i = 0; i < N; ++i) {
@@ -417,7 +417,7 @@
return false;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
const SkScalar tol = 4;
const SkRect r = SkRect::MakeXYWH(x - tol, y - tol, tol * 2, tol * 2);
for (int i = 0; i < N; ++i) {
@@ -534,7 +534,7 @@
return false;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
const SkScalar tol = 8;
const SkRect r = SkRect::MakeXYWH(x - tol, y - tol, tol * 2, tol * 2);
for (int i = 0; i < N; ++i) {
@@ -730,7 +730,7 @@
return false;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
const SkScalar tol = 8;
const SkRect r = SkRect::MakeXYWH(x - tol, y - tol, tol * 2, tol * 2);
for (int i = 0; i < N; ++i) {
diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index 36c6268..c7852ab 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -52,7 +52,7 @@
canvas->drawOval(oval, p);
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
return new Click();
}
@@ -277,7 +277,7 @@
return dx*dx + dy*dy <= rad*rad;
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
for (int i = 0; i < N; ++i) {
if (hit_test(fPoly[i], x, y)) {
return new VertClick(&fPoly[i]);
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp
index 7a68541..72dfabc 100644
--- a/samplecode/SampleQuadStroker.cpp
+++ b/samplecode/SampleQuadStroker.cpp
@@ -722,7 +722,7 @@
};
virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y,
- ModifierKey modi) override {
+ skui::ModifierKey modi) override {
for (size_t i = 0; i < SK_ARRAY_COUNT(fPts); ++i) {
if (hittest(fPts[i], x, y)) {
return new MyClick((int)i);
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 688d57d..58ad5e0 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -327,7 +327,7 @@
}
virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y,
- ModifierKey modi) override {
+ skui::ModifierKey modi) override {
return fRect.contains(SkScalarRoundToInt(x),
SkScalarRoundToInt(y)) ? new Click() : nullptr;
}
diff --git a/samplecode/SampleSG.cpp b/samplecode/SampleSG.cpp
index 2dbc7c5..bb2bf89 100644
--- a/samplecode/SampleSG.cpp
+++ b/samplecode/SampleSG.cpp
@@ -72,7 +72,7 @@
fScene->render(canvas);
}
- Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) override {
+ Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
if (auto node = fScene->nodeAt({x, y})) {
Click* click = new Click();
click->fMeta.setPtr("node", (void*)node);
diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index ed8bf7a..09cb87c 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp
@@ -443,7 +443,7 @@
gProc[fIndex](canvas);
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
this->init();
fIndex = (fIndex + 1) % SK_ARRAY_COUNT(gProc);
return nullptr;
diff --git a/samplecode/SampleStringArt.cpp b/samplecode/SampleStringArt.cpp
index 2eaf4e3..bda466c 100644
--- a/samplecode/SampleStringArt.cpp
+++ b/samplecode/SampleStringArt.cpp
@@ -50,7 +50,7 @@
canvas->drawPath(path, paint);
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
fAngle = x/width();
return nullptr;
}
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 4563703..25afd41 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -99,7 +99,7 @@
}
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
return new Click();
}
diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index fdbda8b..ba0a939 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp
@@ -160,7 +160,7 @@
canvas->restore();
}
- Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
// Check mode buttons first
for (int i = 0; i < N_Modes; ++i) {
if (fModeButtons[i].hitTest(x, y)) {
@@ -182,7 +182,7 @@
bool onClick(Click* click) override {
int32_t mode;
if (click->fMeta.findS32("mode", &mode)) {
- if (fSelected && InputState::kUp == click->fState) {
+ if (fSelected && skui::InputState::kUp == click->fState) {
fSelected->fMode = gModes[mode];
}
} else {