aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode
diff options
context:
space:
mode:
authorGravatar brianosman <brianosman@google.com>2016-04-20 09:20:46 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-20 09:20:46 -0700
commit36db3f44b6cd71d1f462626601ec7c33fdcc187c (patch)
tree8e1f2d3c6551ea3083451a972abb7523655ef878 /samplecode
parent906021334fcf45e97670f877ea6f41bb2bc3b060 (diff)
Add control of the sRGB global hack flag in SampleApp
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/SampleApp.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 12580cbb25..df091ae26d 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -22,6 +22,7 @@
#include "SkPaintFilterCanvas.h"
#include "SkPicture.h"
#include "SkPictureRecorder.h"
+#include "SkPM4fPriv.h"
#include "SkStream.h"
#include "SkSurface.h"
#include "SkTemplates.h"
@@ -934,6 +935,8 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
itemID = fAppMenu->appendList("ColorType", "ColorType", sinkID, 0,
gConfig[0].fName, gConfig[1].fName, gConfig[2].fName, nullptr);
fAppMenu->assignKeyEquivalentToItem(itemID, 'C');
+ itemID = fAppMenu->appendSwitch("sRGB SkColor", "sRGB SkColor", sinkID, gTreatSkColorAsSRGB);
+ fAppMenu->assignKeyEquivalentToItem(itemID, 'S');
itemID = fAppMenu->appendList("Device Type", "Device Type", sinkID, 0,
"Raster",
@@ -1649,7 +1652,8 @@ bool SampleWindow::onEvent(const SkEvent& evt) {
SkOSMenu::FindListIndex(evt, "Hinting", &fHintingState) ||
SkOSMenu::FindSwitchState(evt, "Clip", &fUseClip) ||
SkOSMenu::FindSwitchState(evt, "Zoomer", &fShowZoomer) ||
- SkOSMenu::FindSwitchState(evt, "Magnify", &fMagnify))
+ SkOSMenu::FindSwitchState(evt, "Magnify", &fMagnify) ||
+ SkOSMenu::FindSwitchState(evt, "sRGB SkColor", &gTreatSkColorAsSRGB))
{
this->inval(nullptr);
this->updateTitle();
@@ -2158,6 +2162,10 @@ void SampleWindow::updateTitle() {
title.appendf(" %s", find_config_name(this->info()));
+ if (gTreatSkColorAsSRGB) {
+ title.append(" sRGB");
+ }
+
this->setTitle(title.c_str());
}