Allow for drawing images with negative coords. Remove redundant check

4ms · Nov 14, 2023 · 7be589f · 7be589f
1 parent dc50094
commit 7be589f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/firmware/src/VCV_adaptor/helpers.hpp b/firmware/src/VCV_adaptor/helpers.hpp
@@ -33,10 +33,8 @@ T *createElementWidget(math::Vec pos, MetaModule::Coords coord_ref, std::string_
 {
 	auto *o = new T;
 	if (coord_ref == MetaModule::Coords::TopLeft) {
-		if (o->background->box.pos.x != 0.f)
-			pos.x += o->background->box.pos.x;
-		if (o->background->box.pos.y != 0.f)
-			pos.y += o->background->box.pos.y;
+		pos.x += o->background->box.pos.x;
+		pos.y += o->background->box.pos.y;
 	}
 	pos.x = MetaModule::ModuleInfoBase::to_mm(pos.x);
 	pos.y = MetaModule::ModuleInfoBase::to_mm(pos.y);

diff --git a/firmware/src/gui/elements/draw_img.hh b/firmware/src/gui/elements/draw_img.hh
@@ -34,8 +34,8 @@ draw_image(float x, float y, Coords coord_ref, const lv_img_dsc_t *img, lv_obj_t
 	lv_img_set_antialias(obj, true);
 	lv_obj_set_align(obj, LV_ALIGN_TOP_LEFT);
 
-	uint16_t pos_x = std::round(x);
-	uint16_t pos_y = std::round(y);
+	int16_t pos_x = std::round(x);
+	int16_t pos_y = std::round(y);
 	lv_obj_set_pos(obj, pos_x, pos_y);
 	lv_img_set_pivot(obj, width / 2.f, height / 2.f);