Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add braces to C++ single-line loops and conditionals (NFC) (#2973)

Browse Source 
This makes code easier to read and more consistent between C++ and Java.
Also update clang-format settings to always add a line break (even if no braces are used).
This commit is contained in:
Peter Johnson
2020-12-28 12:58:06 -08:00
committed by GitHub
parent 0291a3ff56
commit 2aed432b4b
634 changed files with 10716 additions and 3938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
glass/src/lib/native/cpp/Window.cpp
View File

@@ -28,7 +28,9 @@ void Window::SetVisibility(Visibility visibility) {
}
void Window::Display() {
if (!m_view) return;
if (!m_view) {
return;
}
if (!m_visible || !m_enabled) {
PushID(m_id);
m_view->Hidden();
@@ -36,22 +38,32 @@ void Window::Display() {
return;
}
if (m_posCond != 0) ImGui::SetNextWindowPos(m_pos, m_posCond);
if (m_sizeCond != 0) ImGui::SetNextWindowSize(m_size, m_sizeCond);
if (m_setPadding) ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, m_padding);
if (m_posCond != 0) {
ImGui::SetNextWindowPos(m_pos, m_posCond);
}
if (m_sizeCond != 0) {
ImGui::SetNextWindowSize(m_size, m_sizeCond);
}
if (m_setPadding) {
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, m_padding);
}
char label[128];
std::snprintf(label, sizeof(label), "%s###%s",
m_name.empty() ? m_id.c_str() : m_name.c_str(), m_id.c_str());
if (Begin(label, &m_visible, m_flags)) {
if (m_renamePopupEnabled) PopupEditName(nullptr, &m_name);
if (m_renamePopupEnabled) {
PopupEditName(nullptr, &m_name);
}
m_view->Display();
} else {
m_view->Hidden();
}
End();
if (m_setPadding) ImGui::PopStyleVar();
if (m_setPadding) {
ImGui::PopStyleVar();
}
}
bool Window::DisplayMenuItem(const char* label) {
@@ -83,11 +95,15 @@ void Window::IniReadLine(const char* lineStr) {
m_name = value;
} else if (name == "visible") {
int num;
if (value.getAsInteger(10, num)) return;
if (value.getAsInteger(10, num)) {
return;
}
m_visible = num;
} else if (name == "enabled") {
int num;
if (value.getAsInteger(10, num)) return;
if (value.getAsInteger(10, num)) {
return;
}
m_enabled = num;
}
}