PoliEcho/bakatui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix window overflowing off screen & refactor init_wins() a bit
Some checks failed
/ sync-to-origin (push) Has been cancelled
Details

Browse Source
This commit is contained in:
PoliEcho 2025-01-26 14:50:05 +01:00
parent 025c51c3ad
commit 0119429514
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/marks.cpp
View File

@ -128,43 +128,35 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
x = DEFAULT_X_OFFSET; x = DEFAULT_X_OFFSET;
uint8_t curent_color = 0; uint8_t curent_color = 0;
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
wins[i] = newwin(NLINES, NCOLS, y, x);
{
std::string sub_name = marks_json["Subjects"][i]["Subject"]["Name"];
std::string sub_avg_s = marks_json["Subjects"][i]["AverageText"];
sprintf(label, "%s - avg: %s", sub_name.c_str(), sub_avg_s.c_str()); // Calculate label and max_text_length to determine window width
} std::string sub_name = marks_json["Subjects"][i]["Subject"]["Name"];
curent_color++; std::string sub_avg_s = marks_json["Subjects"][i]["AverageText"];
if (curent_color >= 7) { sprintf(label, "%s - avg: %s", sub_name.c_str(), sub_avg_s.c_str());
curent_color = 1;
}
// search what mark or label is longest
size_t max_text_length = strlen(label); size_t max_text_length = strlen(label);
for (int i = 0; i < marks_json["Subjects"][n]["Marks"][i].size(); i++) { for (int j = 0; j < marks_json["Subjects"][i]["Marks"].size(); j++) {
size_t tocomp = std::string caption = marks_json["Subjects"][i]["Marks"][j]["Caption"];
rm_tr_le_whitespace(marks_json["Subjects"][n]["Marks"][i]["Caption"]) std::string theme = marks_json["Subjects"][i]["Marks"][j]["Theme"];
.length(); caption = rm_tr_le_whitespace(caption);
if (max_text_length < tocomp) { theme = rm_tr_le_whitespace(theme);
max_text_length = tocomp; max_text_length =
} std::max({max_text_length, caption.length(), theme.length()});
tocomp =
rm_tr_le_whitespace(marks_json["Subjects"][n]["Marks"][i]["Theme"])
.length();
if (max_text_length < tocomp) {
max_text_length = tocomp;
}
} }
int width = max_text_length + 4; int width = max_text_length + 4;
win_show(wins[i], label, curent_color, width);
// hanndle windows overflowing off screen
if (x + width > COLS) { if (x + width > COLS) {
x = DEFAULT_X_OFFSET; x = DEFAULT_X_OFFSET;
y += NLINES + 10; y += NLINES + 10;
} else {
x += width + 5;
} }
wins[i] = newwin(NLINES, NCOLS, y, x);
win_show(wins[i], label, curent_color + 1, width);
curent_color = (curent_color + 1) % 7;
x += width + 5;
} }
} }