hellerve/pete
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/hellerve/lampshade

Browse Source 
* 'master' of https://github.com/hellerve/lampshade:
  formatting :)
  ignore DS_Store
This commit is contained in:
Veit Heller
2017-06-20 01:32:23 -04:00
parent fb1ff58f07 f86b0de4a2
commit 025d7cd6aa
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
.DS_Store
JuceLibraryCode/ JuceLibraryCode/
Builds/ Builds/
*bak *bak

37
Source/LookAndFeel.h
View File

@@ -5,15 +5,15 @@
class LampshadeLookAndFeel : public LookAndFeel_V4 { class LampshadeLookAndFeel : public LookAndFeel_V4 {
public: public:
void drawLinearSlider (Graphics& g, void drawLinearSlider (Graphics& g,
int x, int x,
int y, int y,
int width, int width,
int height, int height,
float sliderPos, float sliderPos,
float minSliderPos, float minSliderPos,
float maxSliderPos, float maxSliderPos,
const Slider::SliderStyle s, const Slider::SliderStyle s,
Slider& slider) override Slider& slider) override
{ {
g.setColour(fillColor); g.setColour(fillColor);
g.fillRect((int)(x-minSliderPos), y, (int)(width+minSliderPos+maxSliderPos), height); g.fillRect((int)(x-minSliderPos), y, (int)(width+minSliderPos+maxSliderPos), height);
@@ -21,15 +21,16 @@ public:
} }
void drawLinearSliderThumb(Graphics & g, void drawLinearSliderThumb(Graphics & g,
int x, int x,
int y, int y,
int width, int width,
int height, int height,
float sliderPos, float sliderPos,
float minSliderPos, float minSliderPos,
float maxSliderPos, float maxSliderPos,
const Slider::SliderStyle , const Slider::SliderStyle,
Slider& slider) override { Slider& slider) override
{
g.setColour(sliderColor); g.setColour(sliderColor);
int nwidth = width+minSliderPos+maxSliderPos; int nwidth = width+minSliderPos+maxSliderPos;
g.fillRect((int)(x-minSliderPos), y, (int)(nwidth*((sliderPos-minSliderPos)/width)), height); g.fillRect((int)(x-minSliderPos), y, (int)(nwidth*((sliderPos-minSliderPos)/width)), height);