Skip to content

Commit c158db8

Browse files
d3cod3d3cod3
committed
fixed graphic quirks
1 parent 49cca5e commit c158db8

21 files changed

+48
-48
lines changed

‎src/objects/computer_vision/HaarTracking.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ void HaarTracking::drawObjectNodeConfig(){
253253
ImGui::Text("%s",tempFilename.getFileName().c_str());
254254
if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s",tempFilename.getAbsolutePath().c_str());
255255
}
256-
if(ImGui::Button("OPEN",ImVec2(180*scaleFactor,26*scaleFactor))){
256+
if(ImGui::Button("OPEN",ImVec2(224*scaleFactor,26*scaleFactor))){
257257
loadHaarConfigFlag = true;
258258
}
259259

‎src/objects/data/DataToFile.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void DataToFile::drawObjectNodeConfig(){
179179
if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s",tempFilename.getAbsolutePath().c_str());
180180
}
181181
ImGui::Spacing();
182-
if(ImGui::Button(ICON_FA_FILE_UPLOAD,ImVec2(84*scaleFactor,26*scaleFactor))){
182+
if(ImGui::Button(ICON_FA_FILE_UPLOAD,ImVec2(108*scaleFactor,26*scaleFactor))){
183183
exportFileFlag = true;
184184
}
185185
ImGui::SameLine();
@@ -188,7 +188,7 @@ void DataToFile::drawObjectNodeConfig(){
188188
ImGui::PushStyleColor(ImGuiCol_ButtonActive, VHS_RED_OVER);
189189
char tmp[256];
190190
sprintf(tmp,"%s %s",ICON_FA_CIRCLE, recButtonLabel.c_str());
191-
if(ImGui::Button(tmp,ImVec2(84*scaleFactor,26*scaleFactor))){
191+
if(ImGui::Button(tmp,ImVec2(108*scaleFactor,26*scaleFactor))){
192192
if(!this->inletsConnected[0]){
193193
ofLog(OF_LOG_WARNING,"There is no data cable connected to the object inlet, connect something if you want to export it!");
194194
}else if(!fileSaved){

‎src/objects/data/FileToData.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void FileToData::drawObjectNodeConfig(){
164164
if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s",tempFilename.getAbsolutePath().c_str());
165165
}
166166
ImGui::Spacing();
167-
if(ImGui::Button(ICON_FA_FILE,ImVec2(180*scaleFactor,26*scaleFactor))){
167+
if(ImGui::Button(ICON_FA_FILE,ImVec2(224*scaleFactor,26*scaleFactor))){
168168
openFileFlag = true;
169169
}
170170

‎src/objects/graphics/ImageExporter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,14 @@ void ImageExporter::drawObjectNodeConfig(){
174174
if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s",tempFilename.getAbsolutePath().c_str());
175175
}
176176
ImGui::Spacing();
177-
if(ImGui::Button(ICON_FA_FILE_UPLOAD,ImVec2(84*scaleFactor,26*scaleFactor))){
177+
if(ImGui::Button(ICON_FA_FILE_UPLOAD,ImVec2(108*scaleFactor,26*scaleFactor))){
178178
saveImgFlag = true;
179179
}
180180
ImGui::SameLine();
181181
ImGui::PushStyleColor(ImGuiCol_Button, VHS_RED);
182182
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, VHS_RED_OVER);
183183
ImGui::PushStyleColor(ImGuiCol_ButtonActive, VHS_RED_OVER);
184-
if(ImGui::Button(ICON_FA_CIRCLE " EXPORT",ImVec2(84*scaleFactor,26*scaleFactor))){
184+
if(ImGui::Button(ICON_FA_CIRCLE " EXPORT",ImVec2(108*scaleFactor,26*scaleFactor))){
185185
if(!this->inletsConnected[0]){
186186
ofLog(OF_LOG_WARNING,"There is no ofTexture connected to the object inlet, connect something if you want to export it as image!");
187187
}else if(lastImageFile == ""){

‎src/objects/graphics/ImageLoader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void ImageLoader::drawObjectNodeConfig(){
185185
ImGui::Spacing();
186186
ImGui::Text("Resolution: %s",imgRes.c_str());
187187
ImGui::Spacing();
188-
if(ImGui::Button(ICON_FA_FILE,ImVec2(180*scaleFactor,26*scaleFactor))){
188+
if(ImGui::Button(ICON_FA_FILE,ImVec2(224*scaleFactor,26*scaleFactor))){
189189
loadImgFlag = true;
190190
}
191191

‎src/objects/gui/moPlayerControls.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ moPlayerControls::moPlayerControls() : PatchObject("player controls"){
5656
pause = false;
5757
loop = false;
5858

59-
this->width *= 1.4f;
59+
this->width *= 1.7f;
6060

6161
}
6262

@@ -153,19 +153,19 @@ void moPlayerControls::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
153153
ImGui::PushStyleColor(ImGuiCol_Button, VHS_BLUE);
154154
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, VHS_BLUE_OVER);
155155
ImGui::PushStyleColor(ImGuiCol_ButtonActive, VHS_BLUE_OVER);
156-
if(ImGui::Button(ICON_FA_PLAY,ImVec2(56*scaleFactor,26*scaleFactor))){
156+
if(ImGui::Button(ICON_FA_PLAY,ImVec2(69*scaleFactor,26*scaleFactor))){
157157
*static_cast<string *>(_outletParams[0]) = "play";
158158
}
159159
ImGui::SameLine();
160-
if(ImGui::Button(ICON_FA_STOP,ImVec2(56*scaleFactor,26*scaleFactor))){
160+
if(ImGui::Button(ICON_FA_STOP,ImVec2(69*scaleFactor,26*scaleFactor))){
161161
*static_cast<string *>(_outletParams[0]) = "stop";
162162
}
163163
ImGui::PopStyleColor(3);
164164
ImGui::SameLine();
165165
ImGui::PushStyleColor(ImGuiCol_Button, VHS_YELLOW);
166166
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, VHS_YELLOW_OVER);
167167
ImGui::PushStyleColor(ImGuiCol_ButtonActive, VHS_YELLOW_OVER);
168-
if(ImGui::Button(ICON_FA_PAUSE,ImVec2(56*scaleFactor,26*scaleFactor))){
168+
if(ImGui::Button(ICON_FA_PAUSE,ImVec2(69*scaleFactor,26*scaleFactor))){
169169
pause = !pause;
170170
if(pause){
171171
*static_cast<string *>(_outletParams[0]) = "pause";

‎src/objects/gui/moTimeline.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,11 @@ void moTimeline::drawObjectNodeConfig(){
332332
ImGui::PushStyleColor(ImGuiCol_Button, VHS_BLUE);
333333
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, VHS_BLUE_OVER);
334334
ImGui::PushStyleColor(ImGuiCol_ButtonActive, VHS_BLUE_OVER);
335-
if(ImGui::Button(ICON_FA_PLAY,ImVec2(56*this->scaleFactor,26*this->scaleFactor))){
335+
if(ImGui::Button(ICON_FA_PLAY,ImVec2(69*this->scaleFactor,26*this->scaleFactor))){
336336
timeline->play();
337337
}
338338
ImGui::SameLine();
339-
if(ImGui::Button(ICON_FA_STOP,ImVec2(56*this->scaleFactor,26*this->scaleFactor))){
339+
if(ImGui::Button(ICON_FA_STOP,ImVec2(69*this->scaleFactor,26*this->scaleFactor))){
340340
timeline->setCurrentTimeSeconds(0);
341341
timeline->stop();
342342
}
@@ -345,7 +345,7 @@ void moTimeline::drawObjectNodeConfig(){
345345
ImGui::PushStyleColor(ImGuiCol_Button, VHS_YELLOW);
346346
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, VHS_YELLOW_OVER);
347347
ImGui::PushStyleColor(ImGuiCol_ButtonActive, VHS_YELLOW_OVER);
348-
if(ImGui::Button(ICON_FA_PAUSE,ImVec2(56*this->scaleFactor,26*this->scaleFactor))){
348+
if(ImGui::Button(ICON_FA_PAUSE,ImVec2(69*this->scaleFactor,26*this->scaleFactor))){
349349
isPaused = !isPaused;
350350
if(isPaused){
351351
timeline->stop();

‎src/objects/gui/moValuePlotter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ void moValuePlotter::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
176176
//--------------------------------------------------------------
177177
void moValuePlotter::drawObjectNodeConfig(){
178178
ImGui::Spacing();
179-
ImGui::PushItemWidth(180*scaleFactor);
179+
ImGui::PushItemWidth(224*scaleFactor);
180180
if(ImGui::InputText("Label",&name)){
181181
saveVariableName();
182182
}

‎src/objects/math/Smooth.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void Smooth::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
142142
//--------------------------------------------------------------
143143
void Smooth::drawObjectNodeConfig(){
144144
ImGui::Spacing();
145-
ImGui::PushItemWidth(180*scaleFactor);
145+
ImGui::PushItemWidth(224*scaleFactor);
146146
if(ImGui::SliderFloat("Smoothing",&smoothing,0.0f,1.0f)){
147147
this->setCustomVar(smoothing,"SMOOTHING");
148148
}

‎src/objects/scripting/BashScript.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ void BashScript::drawObjectNodeConfig(){
204204
if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s",tempFilename.getAbsolutePath().c_str());
205205
}
206206
ImGui::Spacing();
207-
if(ImGui::Button("New",ImVec2(180*scaleFactor,26*scaleFactor))){
207+
if(ImGui::Button("New",ImVec2(224*scaleFactor,26*scaleFactor))){
208208
saveScriptFlag = true;
209209
}
210210
ImGui::Spacing();
211-
if(ImGui::Button("Open",ImVec2(180*scaleFactor,26*scaleFactor))){
211+
if(ImGui::Button("Open",ImVec2(224*scaleFactor,26*scaleFactor))){
212212
loadScriptFlag = true;
213213
}
214214

0 commit comments

Comments
 (0)