Cosmetics

This commit is contained in:
Bertrand Songis
2020-04-20 18:49:02 +02:00
parent c836389869
commit 1df048ca6f
13 changed files with 18 additions and 18 deletions
+2 -2
View File
@@ -44,14 +44,14 @@ void Curve::drawBackground(BitmapBuffer * dc)
// dc->drawSolidRect(0, 0, width(), height(), 1, DEFAULT_COLOR); // dc->drawSolidRect(0, 0, width(), height(), 1, DEFAULT_COLOR);
} }
coord_t Curve::getPointX(int x) coord_t Curve::getPointX(int x) const
{ {
return limit<coord_t>(0, return limit<coord_t>(0,
width() / 2 + divRoundClosest(x * width() / 2, RESX), width() / 2 + divRoundClosest(x * width() / 2, RESX),
width() - 1); width() - 1);
} }
coord_t Curve::getPointY(int y) coord_t Curve::getPointY(int y) const
{ {
return limit<coord_t>(0, return limit<coord_t>(0,
height() / 2 - divRoundClosest(y * height() / 2, RESX), height() / 2 - divRoundClosest(y * height() / 2, RESX),
+3 -3
View File
@@ -41,7 +41,7 @@ class Curve: public Window {
} }
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "Curve"; return "Curve";
} }
@@ -71,8 +71,8 @@ class Curve: public Window {
void drawCurve(BitmapBuffer * dc); void drawCurve(BitmapBuffer * dc);
void drawPosition(BitmapBuffer * dc); void drawPosition(BitmapBuffer * dc);
void drawPoint(BitmapBuffer * dc, const CurvePoint & point); void drawPoint(BitmapBuffer * dc, const CurvePoint & point);
coord_t getPointX(int x); coord_t getPointX(int x) const;
coord_t getPointY(int y); coord_t getPointY(int y) const;
}; };
#endif // _CURVE_H_ #endif // _CURVE_H_
+1 -1
View File
@@ -27,7 +27,7 @@ class FabButton: public Button {
FabButton(FormGroup * parent, coord_t x, coord_t y, uint8_t icon, std::function<uint8_t(void)> pressHandler, WindowFlags windowFlags = 0); FabButton(FormGroup * parent, coord_t x, coord_t y, uint8_t icon, std::function<uint8_t(void)> pressHandler, WindowFlags windowFlags = 0);
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "FabButton(" + std::to_string(icon) + ")"; return "FabButton(" + std::to_string(icon) + ")";
} }
+1 -1
View File
@@ -36,7 +36,7 @@ class FullScreenDialog : public FormGroup {
FullScreenDialog(uint8_t type, std::string title, std::string message = "", std::string action = "", std::function<void(void)> confirmHandler = nullptr); FullScreenDialog(uint8_t type, std::string title, std::string message = "", std::string action = "", std::function<void(void)> confirmHandler = nullptr);
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "FullScreenDialog"; return "FullScreenDialog";
} }
+1 -1
View File
@@ -32,7 +32,7 @@ class CurveKeyboard : public Keyboard {
~CurveKeyboard() override; ~CurveKeyboard() override;
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "CurveKeyboard"; return "CurveKeyboard";
} }
+1 -1
View File
@@ -52,7 +52,7 @@ class Page: public Window {
~Page() override; ~Page() override;
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "Page"; return "Page";
} }
+1 -1
View File
@@ -41,7 +41,7 @@ class SourceChoice : public FormField {
} }
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "SourceChoice"; return "SourceChoice";
} }
+1 -1
View File
@@ -258,7 +258,7 @@ class SpecialFunctionButton : public Button {
} }
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "SpecialFunctionButton"; return "SpecialFunctionButton";
} }
+1 -1
View File
@@ -39,7 +39,7 @@ class SwitchWarnDialog: public FullScreenDialog {
} }
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "SwitchWarnDialog"; return "SwitchWarnDialog";
} }
+1 -1
View File
@@ -40,7 +40,7 @@ class SwitchChoice : public FormField {
} }
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "SwitchChoice"; return "SwitchChoice";
} }
+3 -3
View File
@@ -79,7 +79,7 @@ class TabsCarousel: public Window {
TabsCarousel(Window * parent, TabsGroup * menu); TabsCarousel(Window * parent, TabsGroup * menu);
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "TabsCarousel"; return "TabsCarousel";
} }
@@ -118,7 +118,7 @@ class TabsGroupHeader: public FormGroup {
~TabsGroupHeader() override; ~TabsGroupHeader() override;
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "TabsGroupHeader"; return "TabsGroupHeader";
} }
@@ -149,7 +149,7 @@ class TabsGroup: public Window {
~TabsGroup() override; ~TabsGroup() override;
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "TabsGroup"; return "TabsGroup";
} }
+1 -1
View File
@@ -28,7 +28,7 @@ class TimeEdit : public BaseNumberEdit {
TimeEdit(Window * parent, const rect_t & rect, int32_t vmin, int32_t vmax, std::function<int32_t()> getValue, std::function<void(int32_t)> setValue = nullptr); TimeEdit(Window * parent, const rect_t & rect, int32_t vmin, int32_t vmax, std::function<int32_t()> getValue, std::function<void(int32_t)> setValue = nullptr);
#if defined(DEBUG_WINDOWS) #if defined(DEBUG_WINDOWS)
std::string getName() override std::string getName() const override
{ {
return "TimeEdit"; return "TimeEdit";
} }