Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pr fixes

Browse Source
This commit is contained in:
Ricardo Markiewicz
2026-04-08 23:36:47 +02:00
parent 132ca3ac45
commit 7d965a874f
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AGraph.cpp
+10 -21
View File
@@ -209,40 +209,33 @@ void AGraph::drawPath(const Cairo::RefPtr<Cairo::Context>& cr,
} }
} }
void AGraph::drawBars(const Cairo::RefPtr<Cairo::Context>& cr, void AGraph::drawBars(const Cairo::RefPtr<Cairo::Context>& cr, double width, double height,
double width, double height, int current_value, int current_value, const Gdk::RGBA& fg_color) {
const Gdk::RGBA& fg_color) {
current_value = std::min(100, std::max(0, current_value)); current_value = std::min(100, std::max(0, current_value));
double green_height = height * (std::min(current_value, 40) / 100.0); double green_height = height * (std::min(current_value, 40) / 100.0);
cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), 0.5);
0.5);
cr->rectangle(0, height - green_height, width, green_height); cr->rectangle(0, height - green_height, width, green_height);
cr->fill(); cr->fill();
if (current_value > 40) { if (current_value > 40) {
double yellow_height = height * (std::min(current_value, 75) - 40) / 100.0; double yellow_height = height * (std::min(current_value, 75) - 40) / 100.0;
cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), 0.7);
0.7);
cr->rectangle(0, height - green_height - yellow_height, width, yellow_height); cr->rectangle(0, height - green_height - yellow_height, width, yellow_height);
cr->fill(); cr->fill();
} }
if (current_value > 75) { if (current_value > 75) {
double orange_height = height * (std::min(current_value, 85) - 75) / 100.0; double orange_height = height * (std::min(current_value, 85) - 75) / 100.0;
cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), 0.85);
0.85);
double yellow_height = height * (std::min(current_value, 75) - 40) / 100.0; double yellow_height = height * (std::min(current_value, 75) - 40) / 100.0;
cr->rectangle(0, height - green_height - yellow_height - orange_height, width, cr->rectangle(0, height - green_height - yellow_height - orange_height, width, orange_height);
orange_height);
cr->fill(); cr->fill();
} }
if (current_value > 85) { if (current_value > 85) {
double red_height = height * (current_value - 85) / 100.0; double red_height = height * (current_value - 85) / 100.0;
cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), 1.0);
1.0);
double yellow_height = height * (std::min(current_value, 75) - 40) / 100.0; double yellow_height = height * (std::min(current_value, 75) - 40) / 100.0;
double orange_height = height * (std::min(current_value, 85) - 75) / 100.0; double orange_height = height * (std::min(current_value, 85) - 75) / 100.0;
cr->rectangle(0, height - green_height - yellow_height - orange_height - red_height, width, cr->rectangle(0, height - green_height - yellow_height - orange_height - red_height, width,
@@ -268,25 +261,21 @@ void AGraph::drawGauge(const Cairo::RefPtr<Cairo::Context>& cr, double width, do
double angle2 = angle1 + 0.3 * angle1; double angle2 = angle1 + 0.3 * angle1;
// Green section (0-33%) // Green section (0-33%)
cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), 0.5);
0.5);
cr->arc(center_x, center_y, radius, angle1, angle2); cr->arc(center_x, center_y, radius, angle1, angle2);
cr->stroke(); cr->stroke();
// Yellow section (33-66%) // Yellow section (33-66%)
angle1 = angle2; angle1 = angle2;
angle2 = angle1 + 0.3 * angle1; angle2 = angle1 + 0.3 * angle1;
cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), 0.75);
0.75);
cr->arc(center_x, center_y, radius, angle1, angle2); cr->arc(center_x, center_y, radius, angle1, angle2);
cr->stroke(); cr->stroke();
// Red section (66-100%) // Red section (66-100%)
angle1 = angle2; angle1 = angle2;
angle2 = 0.0; angle2 = 0.0;
cr->set_source_rgba(1.0, 0.0, 0.0, 0.8); cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(), 1.0);
cr->set_source_rgba(fg_color.get_red(), fg_color.get_green(), fg_color.get_blue(),
1.0);
cr->arc(center_x, center_y, radius, angle1, angle2); cr->arc(center_x, center_y, radius, angle1, angle2);
cr->stroke(); cr->stroke();
src/modules/custom_graph.cpp
-1
View File
@@ -228,7 +228,6 @@ void waybar::modules::CustomGraph::parseOutputRaw() {
text_ = validated_line; text_ = validated_line;
tooltip_ = validated_line; tooltip_ = validated_line;
} }
tooltip_ = validated_line;
class_.clear(); class_.clear();
} else if (i == 1) { } else if (i == 1) {
if (config_["escape"].isBool() && config_["escape"].asBool()) { if (config_["escape"].isBool() && config_["escape"].asBool()) {