aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-11-22 11:14:27 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-22 16:37:24 +0000
commit2bd856ded9233800ca69beb0d4ec4193636acea7 (patch)
treecbf01691c2ac699650ce6f3f85c2224ceed93d42
parente1e926a79c9224691941ba2bd207be30f08b0790 (diff)
Fix XferDemo by sending push button events directly to parent
Bug: skia: Change-Id: I3141dd34a9a04c7a660000cba9e483191f28ef03 Reviewed-on: https://skia-review.googlesource.com/75362 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
-rw-r--r--samplecode/SampleXfer.cpp30
1 files changed, 8 insertions, 22 deletions
diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index 87427fc8f3..4ea313d142 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp
@@ -30,21 +30,9 @@ const SkBlendMode gModes[] = {
};
const int N_Modes = SK_ARRAY_COUNT(gModes);
-class HasEventWig : public SkView {
-public:
- void postWidgetEvent() {
- SkEvent evt;
- this->onPrepareWidEvent(&evt);
- this->postToListeners(evt, 0);
- }
-
-protected:
- virtual void onPrepareWidEvent(SkEvent*) {}
-};
-
static SkRandom gRand;
-class PushButtonWig : public HasEventWig {
+class PushButtonWig : public SkView {
SkString fLabel;
SkColor fColor;
uint32_t fFast32;
@@ -55,14 +43,15 @@ public:
fFast32 = fast;
}
-protected:
- void onPrepareWidEvent(SkEvent* evt) override {
- evt->setType("push-button");
- evt->setFast32(fFast32);
- evt->setString("label", fLabel.c_str());
+ void postWidgetEvent() {
+ SkEvent evt;
+ evt.setType("push-button");
+ evt.setFast32(fFast32);
+ evt.setString("label", fLabel.c_str());
+ this->sendEventToParents(evt);
}
-// bool onEvent(const SkEvent&) override;
+protected:
void onDraw(SkCanvas* canvas) override {
SkRect r;
this->getLocalBounds(&r);
@@ -98,9 +87,6 @@ protected:
}
return true;
}
-
-private:
- typedef HasEventWig INHERITED;
};