Skip to content
This repository has been archived by the owner on Dec 1, 2020. It is now read-only.

Commit

Permalink
removed ofxUIEnvelopEditor
Browse files Browse the repository at this point in the history
  • Loading branch information
@rezaali
rezaali committed Feb 21, 2014
1 parent 0f8e71a commit 1f524f2
Show file tree
Hide file tree
Showing 24 changed files with 47 additions and 775 deletions.
12 changes: 0 additions & 12 deletions example-AllWidgets/example-AllWidgets.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
9E42EF5C189EECDB00C2F4E4 /* ofxUICircleSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E7211B9189EE9470079DE42 /* ofxUICircleSlider.cpp */; };
9E42EF5D189EECDB00C2F4E4 /* ofxUIDragableLabelButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E7211BC189EE9470079DE42 /* ofxUIDragableLabelButton.cpp */; };
9E42EF5E189EECDB00C2F4E4 /* ofxUIDropDownList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E7211BE189EE9470079DE42 /* ofxUIDropDownList.cpp */; };
9E42EF5F189EECDB00C2F4E4 /* ofxUIEnvelope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E7211C0189EE9470079DE42 /* ofxUIEnvelope.cpp */; };
9E42EF60189EECDB00C2F4E4 /* ofxUIEnvelopeEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E7211C2189EE9470079DE42 /* ofxUIEnvelopeEditor.cpp */; };
9E42EF61189EECDB00C2F4E4 /* ofxUIEventArgs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E7211C4189EE9470079DE42 /* ofxUIEventArgs.cpp */; };
9E42EF62189EECDB00C2F4E4 /* ofxUIFPS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E7211C6189EE9470079DE42 /* ofxUIFPS.cpp */; };
9E42EF63189EECDB00C2F4E4 /* ofxUIFPSSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E7211C8189EE9470079DE42 /* ofxUIFPSSlider.cpp */; };
Expand Down Expand Up @@ -134,10 +132,6 @@
9E7211BD189EE9470079DE42 /* ofxUIDragableLabelButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIDragableLabelButton.h; sourceTree = "<group>"; };
9E7211BE189EE9470079DE42 /* ofxUIDropDownList.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIDropDownList.cpp; sourceTree = "<group>"; };
9E7211BF189EE9470079DE42 /* ofxUIDropDownList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIDropDownList.h; sourceTree = "<group>"; };
9E7211C0189EE9470079DE42 /* ofxUIEnvelope.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIEnvelope.cpp; sourceTree = "<group>"; };
9E7211C1189EE9470079DE42 /* ofxUIEnvelope.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIEnvelope.h; sourceTree = "<group>"; };
9E7211C2189EE9470079DE42 /* ofxUIEnvelopeEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIEnvelopeEditor.cpp; sourceTree = "<group>"; };
9E7211C3189EE9470079DE42 /* ofxUIEnvelopeEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIEnvelopeEditor.h; sourceTree = "<group>"; };
9E7211C4189EE9470079DE42 /* ofxUIEventArgs.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIEventArgs.cpp; sourceTree = "<group>"; };
9E7211C5189EE9470079DE42 /* ofxUIEventArgs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIEventArgs.h; sourceTree = "<group>"; };
9E7211C6189EE9470079DE42 /* ofxUIFPS.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIFPS.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -320,10 +314,6 @@
9E7211BD189EE9470079DE42 /* ofxUIDragableLabelButton.h */,
9E7211BE189EE9470079DE42 /* ofxUIDropDownList.cpp */,
9E7211BF189EE9470079DE42 /* ofxUIDropDownList.h */,
9E7211C0189EE9470079DE42 /* ofxUIEnvelope.cpp */,
9E7211C1189EE9470079DE42 /* ofxUIEnvelope.h */,
9E7211C2189EE9470079DE42 /* ofxUIEnvelopeEditor.cpp */,
9E7211C3189EE9470079DE42 /* ofxUIEnvelopeEditor.h */,
9E7211EF189EE9480079DE42 /* ofxUISlider.cpp */,
9E7211F0189EE9480079DE42 /* ofxUISlider.h */,
9E7211C4189EE9470079DE42 /* ofxUIEventArgs.cpp */,
Expand Down Expand Up @@ -587,8 +577,6 @@
9E42EF5C189EECDB00C2F4E4 /* ofxUICircleSlider.cpp in Sources */,
9E42EF5D189EECDB00C2F4E4 /* ofxUIDragableLabelButton.cpp in Sources */,
9E42EF5E189EECDB00C2F4E4 /* ofxUIDropDownList.cpp in Sources */,
9E42EF5F189EECDB00C2F4E4 /* ofxUIEnvelope.cpp in Sources */,
9E42EF60189EECDB00C2F4E4 /* ofxUIEnvelopeEditor.cpp in Sources */,
9E42EF61189EECDB00C2F4E4 /* ofxUIEventArgs.cpp in Sources */,
9E42EF62189EECDB00C2F4E4 /* ofxUIFPS.cpp in Sources */,
9E42EF63189EECDB00C2F4E4 /* ofxUIFPSSlider.cpp in Sources */,
Expand Down
9 changes: 0 additions & 9 deletions example-AllWidgets/src/ofApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ void ofApp::exit()
delete gui5;
delete[] buffer;
delete img;
delete env;
}

//--------------------------------------------------------------
Expand Down Expand Up @@ -416,14 +415,6 @@ void ofApp::setGUI3()
gui3->setWidgetPosition(OFX_UI_WIDGET_POSITION_DOWN);

gui3->addSpacer();
env = new ofxUIEnvelope();
for(float i = 0; i <= 5; i++)
{
env->addPoint(i/5.0, i/5.0);
}

gui3->addWidgetDown(new ofxUIEnvelopeEditor("ENV", env, 200, 128));

vector<string> items;
items.push_back("FIRST ITEM"); items.push_back("SECOND ITEM"); items.push_back("THIRD ITEM");
items.push_back("FOURTH ITEM"); items.push_back("FIFTH ITEM"); items.push_back("SIXTH ITEM");
Expand Down
1 change: 0 additions & 1 deletion example-AllWidgets/src/ofApp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,4 @@ class ofApp : public ofBaseApp{

float *buffer;
ofImage *img;
ofxUIEnvelope *env;
};
5 changes: 0 additions & 5 deletions example-CanvasMapVector/bin/data/GUI/gui1Settings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<Widget>
<Kind>4</Kind>
<Name>FPS</Name>
<Value>60.007865906</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>BG_RED</Name>
Expand Down
5 changes: 0 additions & 5 deletions example-ContextualMenu/bin/data/GUI/guiSettings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<Widget>
<Kind>4</Kind>
<Name>FPS</Name>
<Value>59.953403473</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>RADIUS</Name>
Expand Down
10 changes: 5 additions & 5 deletions example-CustomPlacement/src/ofApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ void ofApp::setup()
gui->addWidgetDown(new ofxUILabel("CUSTOM WIDGET LAYOUT", OFX_UI_FONT_LARGE), OFX_UI_ALIGN_RIGHT);

gui->addWidget(new ofxUILabel(360, 300, "2D PAD", OFX_UI_FONT_MEDIUM));
gui->addWidgetSouthOf(new ofxUI2DPad(320, 190, ofPoint(320*.5,190*.5), "PAD"), "2D PAD");
gui->addWidgetWestOf(new ofxUITextInput(160, "TEXT INPUT", "Input Text", OFX_UI_FONT_LARGE), "PAD");
gui->addWidgetSouthOf(new ofxUI2DPad("PAD", ofPoint(0, 320), ofPoint(0, 190), ofPoint(320*.5,190*.5), 320, 190), "2D PAD");
gui->addWidgetWestOf(new ofxUITextInput("TEXT INPUT", "Input Text", 320, dim, 0, 0, OFX_UI_FONT_MEDIUM), "PAD");
gui->addWidgetEastOf(new ofxUISlider("0", 0.0, 255.0, 150, dim, 190), "PAD");
gui->addWidgetNorthOf(new ofxUIToggle(dim, dim, false, "D_GRID"), "TEXT INPUT");
gui->addWidgetWestOf(new ofxUIToggle(dim, dim, true, "D2"), "D_GRID");
gui->addWidgetNorthOf(new ofxUIToggle("D_GRID", false, dim, dim), "2D PAD");
gui->addWidgetWestOf(new ofxUIToggle("D2", true, dim, dim), "D_GRID");
gui->addWidgetNorthOf(new ofxUISlider("GREEN", 0.0, 255.0, &green, 320, dim), "D2");
gui->addWidgetNorthOf(new ofxUISlider("BLUE", 0.0, 255.0, &blue, 320, dim), "GREEN");
gui->addWidgetLeft(new ofxUIToggle(dim, dim, true, "NEW"));
gui->addWidgetLeft(new ofxUIToggle("NEW", true, dim, dim));

gui->addWidgetSouthOf(new ofxUISlider("RED", 0.0, 255.0, &red, 320, dim), "PAD");
gui->autoSizeToFitWidgets();
Expand Down
10 changes: 10 additions & 0 deletions example-CustomWidgets/bin/data/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
<BColor>88</BColor>
<AColor>255</AColor>
</Widget>
<Widget>
<Kind>22</Kind>
<Name>DDL</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>17</Kind>
<Name>FIRST</Name>
Expand All @@ -53,6 +58,11 @@
<Name>FOURTH</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>22</Kind>
<Name>MULTIPLE</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>17</Kind>
<Name>FIFTH</Name>
Expand Down
2 changes: 1 addition & 1 deletion example-SaveLoadSettings/bin/data/gui2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</Widget>
<Widget>
<Kind>8</Kind>
<Name>NUMBER DIALER</Name>
<Name>DIALER</Name>
<Value>5000.000000000</Value>
</Widget>
<Widget>
Expand Down
5 changes: 5 additions & 0 deletions example-SaveLoadSettings/bin/data/gui3.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,11 @@
<Name>IMAGETGL</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>22</Kind>
<Name>DROP DOWN LIST</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>17</Kind>
<Name>FIRST ITEM</Name>
Expand Down
11 changes: 1 addition & 10 deletions example-SaveLoadSettings/bin/data/gui4.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,13 @@
<Widget>
<Kind>26</Kind>
<Name>BILABEL</Name>
<Value>74.384239197</Value>
<Value>75.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>MINIMAL</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>FPS SLIDER</Name>
<Value>59.998012543</Value>
</Widget>
<Widget>
<Kind>28</Kind>
<Name>SAMPLER</Name>
Expand All @@ -35,7 +30,3 @@
<Name>IMAGE TOGGLE</Name>
<Value>1</Value>
</Widget>
<Widget>
<Kind>44</Kind>
<Name>SORTABLE LIST</Name>
</Widget>
2 changes: 1 addition & 1 deletion example-SaveLoadSettings/src/ofApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ void ofApp::setGUI2()

gui2->addSpacer();
gui2->addLabel("NUMBER DIALER");
gui2->addNumberDialer("NUMBER DIALER", -10000, 10000, 5000, 1);
gui2->addNumberDialer("DIALER", -10000, 10000, 5000, 1);

gui2->addSpacer();
gui2->addLabel("LABEL BUTTON", OFX_UI_FONT_MEDIUM);
Expand Down
12 changes: 0 additions & 12 deletions example-Tutorial/example-Tutorial.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
9E42EF2D189EEC8900C2F4E4 /* ofxUICircleSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E42EED1189EEB9000C2F4E4 /* ofxUICircleSlider.cpp */; };
9E42EF2E189EEC8900C2F4E4 /* ofxUIDragableLabelButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E42EED4189EEB9000C2F4E4 /* ofxUIDragableLabelButton.cpp */; };
9E42EF2F189EEC8900C2F4E4 /* ofxUIDropDownList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E42EED6189EEB9000C2F4E4 /* ofxUIDropDownList.cpp */; };
9E42EF30189EEC8900C2F4E4 /* ofxUIEnvelope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E42EED8189EEB9000C2F4E4 /* ofxUIEnvelope.cpp */; };
9E42EF31189EEC8900C2F4E4 /* ofxUIEnvelopeEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E42EEDA189EEB9000C2F4E4 /* ofxUIEnvelopeEditor.cpp */; };
9E42EF32189EEC8900C2F4E4 /* ofxUIEventArgs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E42EEDC189EEB9000C2F4E4 /* ofxUIEventArgs.cpp */; };
9E42EF33189EEC8900C2F4E4 /* ofxUIFPS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E42EEDE189EEB9000C2F4E4 /* ofxUIFPS.cpp */; };
9E42EF34189EEC8900C2F4E4 /* ofxUIFPSSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E42EEE0189EEB9000C2F4E4 /* ofxUIFPSSlider.cpp */; };
Expand Down Expand Up @@ -134,10 +132,6 @@
9E42EED5189EEB9000C2F4E4 /* ofxUIDragableLabelButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIDragableLabelButton.h; sourceTree = "<group>"; };
9E42EED6189EEB9000C2F4E4 /* ofxUIDropDownList.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIDropDownList.cpp; sourceTree = "<group>"; };
9E42EED7189EEB9000C2F4E4 /* ofxUIDropDownList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIDropDownList.h; sourceTree = "<group>"; };
9E42EED8189EEB9000C2F4E4 /* ofxUIEnvelope.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIEnvelope.cpp; sourceTree = "<group>"; };
9E42EED9189EEB9000C2F4E4 /* ofxUIEnvelope.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIEnvelope.h; sourceTree = "<group>"; };
9E42EEDA189EEB9000C2F4E4 /* ofxUIEnvelopeEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIEnvelopeEditor.cpp; sourceTree = "<group>"; };
9E42EEDB189EEB9000C2F4E4 /* ofxUIEnvelopeEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIEnvelopeEditor.h; sourceTree = "<group>"; };
9E42EEDC189EEB9000C2F4E4 /* ofxUIEventArgs.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIEventArgs.cpp; sourceTree = "<group>"; };
9E42EEDD189EEB9000C2F4E4 /* ofxUIEventArgs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ofxUIEventArgs.h; sourceTree = "<group>"; };
9E42EEDE189EEB9000C2F4E4 /* ofxUIFPS.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ofxUIFPS.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -309,8 +303,6 @@
9E42EED1189EEB9000C2F4E4 /* ofxUICircleSlider.cpp */,
9E42EED4189EEB9000C2F4E4 /* ofxUIDragableLabelButton.cpp */,
9E42EED6189EEB9000C2F4E4 /* ofxUIDropDownList.cpp */,
9E42EED8189EEB9000C2F4E4 /* ofxUIEnvelope.cpp */,
9E42EEDA189EEB9000C2F4E4 /* ofxUIEnvelopeEditor.cpp */,
9E42EEDC189EEB9000C2F4E4 /* ofxUIEventArgs.cpp */,
9E42EEDE189EEB9000C2F4E4 /* ofxUIFPS.cpp */,
9E42EEE0189EEB9000C2F4E4 /* ofxUIFPSSlider.cpp */,
Expand Down Expand Up @@ -357,8 +349,6 @@
9E42EED3189EEB9000C2F4E4 /* ofxUIDefines.h */,
9E42EED5189EEB9000C2F4E4 /* ofxUIDragableLabelButton.h */,
9E42EED7189EEB9000C2F4E4 /* ofxUIDropDownList.h */,
9E42EED9189EEB9000C2F4E4 /* ofxUIEnvelope.h */,
9E42EEDB189EEB9000C2F4E4 /* ofxUIEnvelopeEditor.h */,
9E42EEDD189EEB9000C2F4E4 /* ofxUIEventArgs.h */,
9E42EEDF189EEB9000C2F4E4 /* ofxUIFPS.h */,
9E42EEE1189EEB9000C2F4E4 /* ofxUIFPSSlider.h */,
Expand Down Expand Up @@ -587,8 +577,6 @@
9E42EF2D189EEC8900C2F4E4 /* ofxUICircleSlider.cpp in Sources */,
9E42EF2E189EEC8900C2F4E4 /* ofxUIDragableLabelButton.cpp in Sources */,
9E42EF2F189EEC8900C2F4E4 /* ofxUIDropDownList.cpp in Sources */,
9E42EF30189EEC8900C2F4E4 /* ofxUIEnvelope.cpp in Sources */,
9E42EF31189EEC8900C2F4E4 /* ofxUIEnvelopeEditor.cpp in Sources */,
9E42EF32189EEC8900C2F4E4 /* ofxUIEventArgs.cpp in Sources */,
9E42EF33189EEC8900C2F4E4 /* ofxUIFPS.cpp in Sources */,
9E42EF34189EEC8900C2F4E4 /* ofxUIFPSSlider.cpp in Sources */,
Expand Down
25 changes: 0 additions & 25 deletions src/ofxUICanvas.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1650,31 +1650,6 @@ ofxUI2DPad* ofxUICanvas::add2DPad(string _name, ofxUIVec3f _rangeX, ofxUIVec3f _
return widget;
}

/* CUSTOM ENVELOPE EDITOR */
ofxUIEnvelopeEditor* ofxUICanvas::addEnvelopeEditor(string _name, ofxUIVec3f _rangeX, ofxUIVec3f _rangeY, ofxUIVec3f _value, float h)
{
if(h == -1)
{
h = globalGraphHeight;
}
float dim = rect->getWidth()-widgetSpacing*2;
ofxUIEnvelopeEditor* widget = new ofxUIEnvelopeEditor(_name, dim, h, 0, 0);
addWidgetPosition(widget, widgetPosition, widgetAlign);
return widget;
}

ofxUIEnvelopeEditor* ofxUICanvas::addEnvelopeEditor(string _name, ofxUIVec3f _rangeX, ofxUIVec3f _rangeY, ofxUIVec3f _value, float w, float h, float x, float y)
{
if(h == -1)
{
h = globalGraphHeight;
}
ofxUIEnvelopeEditor* widget = new ofxUIEnvelopeEditor(_name, w, h, x, y);
addWidgetPosition(widget, widgetPosition, widgetAlign);
return widget;
}


ofxUITextInput* ofxUICanvas::addTextInput(string _name, string _textstring, int _size)
{
float h = 0;
Expand Down
6 changes: 1 addition & 5 deletions src/ofxUICanvas.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,7 @@ class ofxUICanvas : public ofxUIWidget, public ofxUIAppCBGlue
ofxUI2DPad* add2DPad(string _name, ofxUIVec3f _rangeX, ofxUIVec3f _rangeY, ofxUIVec3f _value, float w, float h, float x = 0, float y = 0);
ofxUI2DPad* add2DPad(string _name, ofxUIVec3f _rangeX, ofxUIVec3f _rangeY, ofxUIVec3f *_value);
ofxUI2DPad* add2DPad(string _name, ofxUIVec3f _rangeX, ofxUIVec3f _rangeY, ofxUIVec3f *_value, float w, float h, float x = 0, float y = 0);

/* CUSTOM ENVELOPE EDITOR */
ofxUIEnvelopeEditor* addEnvelopeEditor(string _name, ofxUIVec3f _rangeX, ofxUIVec3f _rangeY, ofxUIVec3f _value, float h = -1);
ofxUIEnvelopeEditor* addEnvelopeEditor(string _name, ofxUIVec3f _rangeX, ofxUIVec3f _rangeY, ofxUIVec3f _value, float w, float h = -1, float x = 0, float y = 0);


ofxUITextInput* addTextInput(string _name, string _textstring, int _size = -1);
ofxUITextInput* addTextInput(string _name, string _textstring, float w, float h = 0, float x = 0, float y = 0, int _size = -1);

Expand Down
29 changes: 14 additions & 15 deletions src/ofxUIDefines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@
#include "ofxXmlSettings.h"
#endif

#ifdef TARGET_OF_IOS
#define OFX_UI_FONT_NAME "GUI/Helvetica.ttf"
#else
#define OFX_UI_FONT_NAME "sans-serif"
#endif

#define OFX_UI_FONT_RESOLUTION 150
#define OFX_UI_FONT_LARGE_SIZE 10
#define OFX_UI_FONT_MEDIUM_SIZE 8
#define OFX_UI_FONT_SMALL_SIZE 6

#define OFX_UI_LABEL_DRAW_BACK false

#define OFX_UI_STATE_NORMAL 0
#define OFX_UI_STATE_OVER 1
#define OFX_UI_STATE_DOWN 2
Expand Down Expand Up @@ -57,7 +70,6 @@
#define OFX_UI_COLOR_PADDED ofxUIColor(0, OFX_UI_COLOR_PADDED_ALPHA) //rect's padded color
#define OFX_UI_COLOR_PADDED_OUTLINE ofxUIColor(255, OFX_UI_COLOR_PADDED_OUTLINE_ALPHA) //rect's padded outline color


#define OFX_UI_DRAW_PADDING false
#define OFX_UI_DRAW_PADDING_OUTLINE false

Expand Down Expand Up @@ -230,17 +242,4 @@ enum ofxUIThemeType
OFX_UI_THEME_MINORANGE,
OFX_UI_THEME_GRAYDAY,
OFX_UI_THEME_MINBLACK
};

#ifdef TARGET_OF_IOS
#define OFX_UI_FONT_NAME "GUI/Helvetica.ttf"
#else
#define OFX_UI_FONT_NAME "sans-serif"
#endif

#define OFX_UI_FONT_RESOLUTION 150
#define OFX_UI_FONT_LARGE_SIZE 10
#define OFX_UI_FONT_MEDIUM_SIZE 8
#define OFX_UI_FONT_SMALL_SIZE 6

#define OFX_UI_LABEL_DRAW_BACK false
};

0 comments on commit 1f524f2

Please sign in to comment.