Skip to content

Fix AssetPath - Added Scroll Step parameter #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flowstoner wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix AssetPath - Added Scroll Step parameter #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9fef12
nested example folder to generate or update easly with progectGenerator
Mar 23, 2016
146cb96
Default AssetPath to CurrentExeDir/data/
Mar 23, 2016
660ef36
added Scroll Step optional Parameter
Mar 23, 2016
d60baf0
Revert "nested example folder to generate or update easly with progec…
Mar 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/components/ofxDatGuiScrollView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ class ofxDatGuiScrollView : public ofxDatGuiComponent {

public:

ofxDatGuiScrollView(string name, int nVisible = 6) : ofxDatGuiComponent(name)
ofxDatGuiScrollView(string name, int nVisible = 6, int nScrollStep = 1) : ofxDatGuiComponent(name)
{
mAutoHeight = true;
mNumVisible = nVisible;
mScrollStep = nScrollStep;
setTheme(ofxDatGuiComponent::theme.get());
ofAddListener(ofEvents().mouseScrolled, this, &ofxDatGuiScrollView::onMouseScrolled, OF_EVENT_ORDER_BEFORE_APP);
}
Expand Down Expand Up @@ -232,6 +233,7 @@ class ofxDatGuiScrollView : public ofxDatGuiComponent {
int mY;
int mSpacing;
int mNumVisible;
int mScrollStep;
bool mAutoHeight;

void autoSize()
Expand All @@ -243,20 +245,20 @@ class ofxDatGuiScrollView : public ofxDatGuiComponent {
void onMouseScrolled(ofMouseEventArgs &e)
{
if (children.size() > 0 && mRect.inside(e.x, e.y) == true){
float sy = e.scrollY * 2;
float sy = e.scrollY * children.front()->getHeight() * mScrollStep;
int btnH = children.front()->getHeight() + mSpacing;
int minY = mRect.height + mSpacing - (children.size() * btnH);
bool allowScroll = false;
mY = children.front()->getY();
if (sy < 0){
if (mY > minY){
mY += sy;
mY += sy + mSpacing;
if (mY < minY) mY = minY;
allowScroll = true;
}
} else if (sy > 0){
if (mY < 0){
mY += sy;
mY += sy - mSpacing;
if (mY > 0) mY = 0;
allowScroll = true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/ofxDatGuiComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

bool ofxDatGuiLog::mQuiet = false;
std::unique_ptr<ofxDatGuiTheme> ofxDatGuiComponent::theme;
string ofxDatGuiTheme::AssetPath = "../../../../../addons/ofxDatGui/";
string ofxDatGuiTheme::AssetPath = ofFilePath::getCurrentExeDir() + "/data/";

ofxDatGuiComponent::ofxDatGuiComponent(string label)
{
Expand Down