Skip to content

Commit

Permalink
Code cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
JF002 committed Mar 17, 2018
1 parent e0a3ab0 commit 1a2ef10
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
1 change: 0 additions & 1 deletion src/Button.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace Codingfield {
void SetTextColor(Color c);
virtual void SetSelected(bool s) override;
void SetText(const std::string& t);

void Draw() override;
private:
Color backgroundColor = BLACK;
Expand Down
7 changes: 2 additions & 5 deletions src/StatusBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ extern const uint8_t image_data_wifi2[];
extern const uint8_t image_data_wifi3[];

void StatusBar::SetWifiStatus(const StatusBar::WifiStatuses status) {
if(wifiStatus != status){
if(wifiStatus != status) {
wifiStatus = status;
isUpdated = true;
}
Expand Down Expand Up @@ -42,10 +42,7 @@ void StatusBar::Draw() {

M5.Lcd.setTextDatum(TC_DATUM);
M5.Lcd.drawString(dateTime.c_str(), 160, 5);
/*
M5.Lcd.setTextDatum(TR_DATUM);
M5.Lcd.drawString("21C", 319, 5);
*/

const uint8_t* wifibmp = image_data_wifi0;
switch(wifiStatus) {
case WifiStatuses::Weak: wifibmp = image_data_wifi1; break;
Expand Down
1 change: 0 additions & 1 deletion src/StatusBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ namespace Codingfield {
enum class WifiStatuses {No_signal, Weak, Medium, Full};
StatusBar(Widget* parent, Point position, int32_t height) : Bar(parent, position, height) {}
void Draw() override;

void SetWifiStatus(const WifiStatuses status);
void SetUptime(const uint32_t t);
void SetDateTime(const std::string& t);
Expand Down
3 changes: 2 additions & 1 deletion src/Widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
using namespace Codingfield::UI;

Widget::Widget(Widget* parent) : Widget(parent, Point(0,0), Size(0,0)) {
}

}

Widget::Widget(Widget* parent, Point position, Size size) : parent{parent}, position{position}, size {size} {
if(parent != nullptr)
Expand Down
3 changes: 1 addition & 2 deletions src/WidgetMosaic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ WidgetMosaic::WidgetMosaic(Widget* parent, Point position, Size size) : Widget(p
}

void WidgetMosaic::Draw() {
for(Widget* w : children) {
for(Widget* w : children)
w->Draw();
}
}

void WidgetMosaic::AddChild(Widget* widget) {
Expand Down

0 comments on commit 1a2ef10

Please sign in to comment.