Fixed compile on OSX and cleaned up IndexerLayout.

This commit is contained in:
Casey Langen 2016-07-03 01:58:46 -07:00
parent cb4e3af1cb
commit a6bf8dbbac
3 changed files with 2 additions and 7 deletions

View File

@ -24,6 +24,7 @@ set (BOX_SRCS
./app/window/LogWindow.cpp
./app/window/OutputWindow.cpp
./app/window/ResourcesWindow.cpp
./app/window/ShortcutsWindow.cpp
./app/window/TrackListView.cpp
./app/window/TransportWindow.cpp
./cursespp/Checkbox.cpp

View File

@ -90,10 +90,9 @@ void IndexerLayout::Layout() {
this->SetFrameVisible(false);
this->MoveAndResize(x, y, cx, cy);
this->title->MoveAndResize(0, 0, cx, LABEL_HEIGHT);
this->shortcuts->MoveAndResize(0, cy - 1, cx, LABEL_HEIGHT);
int startY = BOTTOM(this->title) + 1;
int startY = 0;
int leftX = 0;
int leftWidth = cx / 3; /* 1/3 width */
int rightX = leftWidth;
@ -145,9 +144,6 @@ int64 IndexerLayout::ListItemDecorator(
}
void IndexerLayout::InitializeWindows() {
this->title.reset(new TextLabel());
this->title->SetText("settings", text::AlignCenter);
this->browseLabel.reset(new TextLabel());
this->browseLabel->SetText("browse (SPACE to add)", text::AlignLeft);
@ -187,7 +183,6 @@ void IndexerLayout::InitializeWindows() {
this->shortcuts->AddShortcut("ALT+`", "console");
this->shortcuts->AddShortcut("CTRL+d", "quit");
this->AddWindow(this->title);
this->AddWindow(this->browseLabel);
this->AddWindow(this->addedPathsLabel);
this->AddWindow(this->browseList);

View File

@ -96,7 +96,6 @@ namespace musik {
std::shared_ptr<cursespp::Checkbox> removeCheckbox;
std::shared_ptr<cursespp::Checkbox> dotfileCheckbox;
std::shared_ptr<cursespp::TextLabel> title;
std::shared_ptr<cursespp::TextLabel> browseLabel;
std::shared_ptr<cursespp::TextLabel> addedPathsLabel;
std::shared_ptr<cursespp::ListWindow> browseList;