Merge branch 'master' of https://github.com/hellerve/lampshade
* 'master' of https://github.com/hellerve/lampshade: formatting :) ignore DS_Store
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
||||
.DS_Store
|
||||
JuceLibraryCode/
|
||||
Builds/
|
||||
*bak
|
||||
|
@@ -5,15 +5,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);
|
||||
@@ -21,15 +21,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);
|
||||
|
Reference in New Issue
Block a user