From f0753bf5ddb3282aebb2ad84df7dc5c06681c371 Mon Sep 17 00:00:00 2001 From: Trent Date: Mon, 19 Jun 2017 18:01:47 -0400 Subject: [PATCH 1/2] ignore DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d15b6a8..0790b55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store JuceLibraryCode/ Builds/ *bak From f86b0de4a268bfaf237b8c024f8fc930c454265b Mon Sep 17 00:00:00 2001 From: Trent Date: Mon, 19 Jun 2017 18:02:07 -0400 Subject: [PATCH 2/2] formatting :) --- Source/LookAndFeel.h | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Source/LookAndFeel.h b/Source/LookAndFeel.h index f737db9..fd9b185 100644 --- a/Source/LookAndFeel.h +++ b/Source/LookAndFeel.h @@ -13,15 +13,15 @@ class LampshadeLookAndFeel : public LookAndFeel_V4 { public: void drawLinearSlider (Graphics& g, - int x, - int y, - int width, - int height, - float sliderPos, - float minSliderPos, - float maxSliderPos, - const Slider::SliderStyle s, - Slider& slider) override + int x, + int y, + int width, + int height, + float sliderPos, + float minSliderPos, + float maxSliderPos, + const Slider::SliderStyle s, + Slider& slider) override { g.setColour(fillColor); g.fillRect((int)(x-minSliderPos), y, (int)(width+minSliderPos+maxSliderPos), height); @@ -29,15 +29,16 @@ public: } void drawLinearSliderThumb(Graphics & g, - int x, - int y, - int width, - int height, - float sliderPos, - float minSliderPos, - float maxSliderPos, - const Slider::SliderStyle , - Slider& slider) override { + int x, + int y, + int width, + int height, + float sliderPos, + float minSliderPos, + float maxSliderPos, + const Slider::SliderStyle, + Slider& slider) override + { g.setColour(sliderColor); int nwidth = width+minSliderPos+maxSliderPos; g.fillRect((int)(x-minSliderPos), y, (int)(nwidth*((sliderPos-minSliderPos)/width)), height);