From a2cfe745b0e8dec5024bc1341f61e3ee802f73fb Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 18 Jan 2009 17:58:58 +0000 Subject: [PATCH] PainterExamples improvement git-svn-id: svn://ultimatepp.org/upp/trunk@784 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- examples/PainterExamples/Gradient.cpp | 21 ++++++++++++++++++-- examples/PainterExamples/GradientReflect.cpp | 11 ---------- examples/PainterExamples/GradientRepeat.cpp | 13 ------------ examples/PainterExamples/PainterExamples.upp | 2 -- examples/PainterExamples/RadialFocus.cpp | 8 ++++---- 5 files changed, 23 insertions(+), 32 deletions(-) delete mode 100644 examples/PainterExamples/GradientReflect.cpp delete mode 100644 examples/PainterExamples/GradientRepeat.cpp diff --git a/examples/PainterExamples/Gradient.cpp b/examples/PainterExamples/Gradient.cpp index bd054f50a..1976f1381 100644 --- a/examples/PainterExamples/Gradient.cpp +++ b/examples/PainterExamples/Gradient.cpp @@ -2,10 +2,27 @@ void FillGradient(Painter& sw) { - sw.Rectangle(0, 0, 500, 500) - .Fill(200, 100, Blue(), 300, 300, LtRed()); + sw.Rectangle(10, 10, 1000, 600) + .Fill(200, 100, Blue(), 300, 300, LtRed()) + .Stroke(2, Black()); +} + +void FillGradientReflect(Painter& sw) +{ + sw.Rectangle(10, 10, 1000, 600) + .Fill(200, 100, Blue(), 300, 300, LtRed(), GRADIENT_REFLECT) + .Stroke(2, Black()); +} + +void FillGradientRepeat(Painter& sw) +{ + sw.Rectangle(10, 10, 1000, 600) + .Fill(200, 100, Blue(), 300, 300, LtRed(), GRADIENT_REPEAT) + .Stroke(2, Black()); } INITBLOCK { RegisterExample("Linear gradient - PAD", FillGradient); + RegisterExample("Linear gradient - REFLECT", FillGradientReflect); + RegisterExample("Linear gradient - REPEAT", FillGradientRepeat); } diff --git a/examples/PainterExamples/GradientReflect.cpp b/examples/PainterExamples/GradientReflect.cpp deleted file mode 100644 index c467b896f..000000000 --- a/examples/PainterExamples/GradientReflect.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "Examples.h" - -void FillGradientReflect(Painter& sw) -{ - sw.Rectangle(0, 0, 500, 500) - .Fill(200, 100, Blue(), 300, 300, LtRed(), GRADIENT_REFLECT); -} - -INITBLOCK { - RegisterExample("Linear gradient - REFLECT", FillGradientReflect); -} diff --git a/examples/PainterExamples/GradientRepeat.cpp b/examples/PainterExamples/GradientRepeat.cpp deleted file mode 100644 index 3ebedd4c1..000000000 --- a/examples/PainterExamples/GradientRepeat.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "Examples.h" - -#include "Examples.h" - -void FillGradientRepeat(Painter& sw) -{ - sw.Rectangle(0, 0, 500, 500) - .Fill(200, 100, Blue(), 300, 300, LtRed(), GRADIENT_REPEAT); -} - -INITBLOCK { - RegisterExample("Linear gradient - REPEAT", FillGradientRepeat); -} diff --git a/examples/PainterExamples/PainterExamples.upp b/examples/PainterExamples/PainterExamples.upp index bbec14fa6..e0580b60e 100644 --- a/examples/PainterExamples/PainterExamples.upp +++ b/examples/PainterExamples/PainterExamples.upp @@ -14,8 +14,6 @@ file Curves.cpp, Clipping.cpp, Gradient.cpp, - GradientReflect.cpp, - GradientRepeat.cpp, ColorStops.cpp, Radial.cpp, RadialFocus.cpp, diff --git a/examples/PainterExamples/RadialFocus.cpp b/examples/PainterExamples/RadialFocus.cpp index 08facf44d..a75a2ff44 100644 --- a/examples/PainterExamples/RadialFocus.cpp +++ b/examples/PainterExamples/RadialFocus.cpp @@ -32,8 +32,8 @@ void RadialFocusRepeat(Painter& sw) } INITBLOCK { - RegisterExample("Radial gradient with focus", RadialFocus); - RegisterExample("Radial gradient with focus - PAD", RadialFocusPad); - RegisterExample("Radial gradient with focus - REFLECT", RadialFocusReflect); - RegisterExample("Radial gradient with focus - REPEAT", RadialFocusRepeat); + RegisterExample("Radial gradient - focus", RadialFocus); + RegisterExample("Radial gradient - focus - PAD", RadialFocusPad); + RegisterExample("Radial gradient - focus - REFLECT", RadialFocusReflect); + RegisterExample("Radial gradient - focus - REPEAT", RadialFocusRepeat); }