jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use QString for LED labels vector

Browse source
This commit is contained in:
Adam Honse 2020-08-20 13:03:10 -05:00
parent 5e002107ef
commit b0b46dd3a5
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qt/DeviceView.cpp
View file

@ -258,7 +258,7 @@ void DeviceView::setController(RGBController * controller_ptr)
{
if(controller->leds[led_idx].name == led_label_lookup[led_label_lookup_idx].led_name)
{
led_labels[led_idx] = led_label_lookup[led_label_lookup_idx].led_label;
led_labels[led_idx] = QString::fromStdString(led_label_lookup[led_label_lookup_idx].led_label);
}
}
}
@ -439,7 +439,7 @@ void DeviceView::paintEvent(QPaintEvent* /* event */)
{
painter.setPen(Qt::white);
}
painter.drawText(rect, Qt::AlignVCenter | Qt::AlignHCenter, QString(led_labels[led_idx].c_str()));
painter.drawText(rect, Qt::AlignVCenter | Qt::AlignHCenter, QString(led_labels[led_idx]));
}
font.setPixelSize(12);

2
qt/DeviceView.h
View file

@ -46,7 +46,7 @@ private:
std::vector<matrix_pos_size_type> zone_pos;
std::vector<matrix_pos_size_type> led_pos;
std::vector<std::string> led_labels;
std::vector<QString> led_labels;
float matrix_h;