Skip to content

Commit e04cdaf

Browse files
authored
ui: revert onroad round border corners (commaai#203)
1 parent 82cb6b6 commit e04cdaf

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

selfdrive/ui/qt/onroad.cc

+2-22
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,7 @@ void OnroadWindow::offroadTransition(bool offroad) {
217217

218218
void OnroadWindow::paintEvent(QPaintEvent *event) {
219219
QPainter p(this);
220-
221-
QPainterPath path;
222-
path.addRoundedRect(rect(), 40, 40);
223-
p.fillPath(path, QColor(bg.red(), bg.green(), bg.blue(), 255));
220+
p.fillRect(rect(), QColor(bg.red(), bg.green(), bg.blue(), 255));
224221
}
225222

226223
// ***** onroad widgets *****
@@ -633,11 +630,7 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) {
633630
QLinearGradient bg(0, header_h - (header_h / 2.5), 0, header_h);
634631
bg.setColorAt(0, QColor::fromRgbF(0, 0, 0, 0.45));
635632
bg.setColorAt(1, QColor::fromRgbF(0, 0, 0, 0));
636-
637-
QRect headerRect(0, 0, width(), header_h);
638-
QPainterPath headerPath;
639-
headerPath.addRoundedRect(headerRect, 30, 30);
640-
p.fillPath(headerPath, bg);
633+
p.fillRect(0, 0, width(), header_h, bg);
641634

642635
QString speedLimitStr = (speedLimit > 1) ? QString::number(std::nearbyint(speedLimit)) : "";
643636
QString speedLimitStrSlc = showSpeedLimit ? QString::number(std::nearbyint(speedLimitSLC)) : "";
@@ -1868,17 +1861,6 @@ void AnnotatedCameraWidget::paintEvent(QPaintEvent *event) {
18681861
CameraWidget::updateCalibration(DEFAULT_CALIBRATION);
18691862
}
18701863
painter.beginNativePainting();
1871-
1872-
// Create a QPainterPath with rounded corners
1873-
QPainterPath path;
1874-
int radius = 30;
1875-
int width = CameraWidget::width();
1876-
int height = CameraWidget::height();
1877-
path.addRoundedRect(0, 0, width, height, radius, radius);
1878-
1879-
// Set the path as the clipping region for the painter
1880-
painter.setClipPath(path);
1881-
18821864
CameraWidget::setFrameId(model.getFrameId());
18831865
CameraWidget::paintGL();
18841866
painter.endNativePainting();
@@ -1887,8 +1869,6 @@ void AnnotatedCameraWidget::paintEvent(QPaintEvent *event) {
18871869
painter.setRenderHint(QPainter::Antialiasing);
18881870
painter.setPen(Qt::NoPen);
18891871

1890-
setBackgroundColor(bg_colors[s->status]);
1891-
18921872
if (s->worldObjectsVisible()) {
18931873
if (sm.rcv_frame("modelV2") > s->scene.started_frame) {
18941874
update_model(s, sm["modelV2"].getModelV2(), sm["uiPlan"].getUiPlan());

0 commit comments

Comments
 (0)