refactor: improve disabled custom button appearance

Signed-off-by: KhalilSelyan <[email protected]>
autowarefoundation · May 21, 2024 · c59041f · c59041f
1 parent 5bc6eed
commit c59041f
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/common/tier4_state_rviz_plugin/src/custom_button.cpp b/common/tier4_state_rviz_plugin/src/custom_button.cpp
@@ -96,21 +96,22 @@ void CustomElevatedButton::paintEvent(QPaintEvent *)
   // Draw button background
   QPainterPath backgroundPath;
   backgroundPath.addRoundedRect(r, cornerRadius, cornerRadius);
-  painter.setBrush(buttonColor);
+  if (!isEnabled()) {
+    painter.setBrush(
+      QColor(autoware::state_rviz_plugin::colors::default_colors.on_surface.c_str()));
+    painter.setOpacity(0.12);
+  } else {
+    painter.setBrush(buttonColor);
+  }
   painter.setPen(Qt::NoPen);
   painter.drawPath(backgroundPath);
 
   // Draw button text
-  painter.setPen(currentTextColor);
-  painter.drawText(r, Qt::AlignCenter, text());
-
   if (!isEnabled()) {
-    painter.setBrush(
-      QColor(autoware::state_rviz_plugin::colors::default_colors.on_surface.c_str()));
-    painter.setPen(Qt::NoPen);
-    painter.setOpacity(0.12);
-    painter.drawPath(backgroundPath);
+    painter.setOpacity(0.38);
   }
+  painter.setPen(currentTextColor);
+  painter.drawText(r, Qt::AlignCenter, text());
 }
 
 void CustomElevatedButton::enterEvent(QEvent * event)