Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toolchain warning #3518

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions LiteEditor/BuildTab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,17 @@ void BuildTab::OnBuildStarted(clBuildEvent& e)
// get the toolchain from the event and attempt to load the compiler
const wxString& toolchain = e.GetToolchain();
if(!toolchain.empty() && BuildSettingsConfigST::Get()->IsCompilerExist(toolchain)) {
m_activeCompiler = BuildSettingsConfigST::Get()->GetCompiler(toolchain);
clDEBUG() << "Active compiler is set to:" << m_activeCompiler->GetName() << endl;
m_activeCompiler = BuildSettingsConfigST::Get()->GetCompiler(toolchain);
clDEBUG() << "Active compiler is set to:" << m_activeCompiler->GetName() << endl;

} else {
clDEBUG() << "Compiler not selected in the workspace build settings or not available" << endl;

// toolchain not selected in build configuration or unavailable
m_view->AppendItem(wxT("\n"));
m_view->AppendItem(WrapLineInColour(wxT("> WARNING: No toolchain selected. Build log highlighting will not be available!\n"), AnsiColours::Yellow()));
m_view->AppendItem(WrapLineInColour(wxT(" Check toolchain properly selected in the workspace build settings.\n"), AnsiColours::Yellow()));
m_view->AppendItem(wxT("\n"));
}

// notify the plugins that the build had started
Expand Down
2 changes: 1 addition & 1 deletion Plugin/bitmap_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ static wxBitmap LoadSidebarBitmapInternal(const wxString& name, wxWindow* win, b
return wxNullBitmap;
}

wxSize button_size{ 32, 32 };
wxSize button_size{ 24, 24 };

auto bmpbundle = wxBitmapBundle::FromSVGFile(svg_path.GetFullPath(), button_size);
if (!bmpbundle.IsOk()) {
Expand Down
Loading