2ace898858
Draw the remaining Qt chrome icons through the existing generated icon path instead of loading TinyVG resources. Add generated folder and chevron icons for menus, the bookmarks bar, and find-in-page controls, and use the generated globe icon for bookmarks without favicons. Remove the Qt TinyVG icon engine and drop the unused TVG resources from the Qt resource file.
315 lines
11 KiB
C++
315 lines
11 KiB
C++
/*
|
|
* Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <LibCore/Resource.h>
|
|
#include <UI/Qt/ChromeStyle.h>
|
|
#include <UI/Qt/Icon.h>
|
|
#include <UI/Qt/StringUtils.h>
|
|
|
|
#include <QPainter>
|
|
#include <QPainterPath>
|
|
#include <QPainterPathStroker>
|
|
#include <QPalette>
|
|
#include <QPen>
|
|
#include <QPixmap>
|
|
#include <QPointF>
|
|
#include <QRectF>
|
|
|
|
namespace Ladybird {
|
|
|
|
QIcon load_icon_from_uri(StringView uri)
|
|
{
|
|
auto resource = MUST(Core::Resource::load_from_uri(uri));
|
|
auto path = qstring_from_ak_string(resource->filesystem_path());
|
|
|
|
return QIcon { path };
|
|
}
|
|
|
|
static QPen chrome_icon_pen(QColor const& color, qreal width)
|
|
{
|
|
return QPen(color, width, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
|
|
}
|
|
|
|
static void draw_stroked_icon_path(QPainter& painter, QPainterPath const& path, QColor const& color, qreal width)
|
|
{
|
|
QPainterPathStroker stroker;
|
|
stroker.setWidth(width);
|
|
stroker.setCapStyle(Qt::RoundCap);
|
|
stroker.setJoinStyle(Qt::RoundJoin);
|
|
|
|
auto stroke = stroker.createStroke(path);
|
|
stroke.setFillRule(Qt::WindingFill);
|
|
painter.fillPath(stroke, color);
|
|
}
|
|
|
|
static void draw_back_icon(QPainter& painter, QColor const& color)
|
|
{
|
|
QPainterPath path;
|
|
path.moveTo(18.8, 10.8);
|
|
path.lineTo(4.7, 10.8);
|
|
path.moveTo(10.8, 5.4);
|
|
path.lineTo(4.7, 10.8);
|
|
path.lineTo(10.8, 16.2);
|
|
draw_stroked_icon_path(painter, path, color, 2.15);
|
|
}
|
|
|
|
static void draw_forward_icon(QPainter& painter, QColor const& color)
|
|
{
|
|
QPainterPath path;
|
|
path.moveTo(1.2, 10.8);
|
|
path.lineTo(15.3, 10.8);
|
|
path.moveTo(9.2, 5.4);
|
|
path.lineTo(15.3, 10.8);
|
|
path.lineTo(9.2, 16.2);
|
|
draw_stroked_icon_path(painter, path, color, 2.15);
|
|
}
|
|
|
|
static void draw_star_icon(QPainter& painter, QColor const& color, bool filled)
|
|
{
|
|
QPainterPath path;
|
|
path.moveTo(10.0, 2.6);
|
|
path.lineTo(12.5, 7.5);
|
|
path.lineTo(18.0, 8.0);
|
|
path.lineTo(13.9, 11.7);
|
|
path.lineTo(15.1, 17.2);
|
|
path.lineTo(10.0, 14.3);
|
|
path.lineTo(4.9, 17.2);
|
|
path.lineTo(6.1, 11.7);
|
|
path.lineTo(2.0, 8.0);
|
|
path.lineTo(7.5, 7.5);
|
|
path.closeSubpath();
|
|
|
|
painter.setPen(chrome_icon_pen(color, filled ? 1.2 : 1.8));
|
|
if (filled)
|
|
painter.setBrush(color);
|
|
else
|
|
painter.setBrush(Qt::NoBrush);
|
|
painter.drawPath(path);
|
|
}
|
|
|
|
static QPixmap create_transparent_icon_pixmap(QSize logical_size, qreal device_pixel_ratio)
|
|
{
|
|
QPixmap pixmap(physical_size_for_device_pixel_ratio(logical_size, device_pixel_ratio));
|
|
pixmap.setDevicePixelRatio(device_pixel_ratio);
|
|
pixmap.fill(Qt::transparent);
|
|
return pixmap;
|
|
}
|
|
|
|
static QPixmap create_chrome_icon_pixmap(ChromeIcon icon, QColor color, qreal device_pixel_ratio)
|
|
{
|
|
auto pixmap = create_transparent_icon_pixmap({ 20, 20 }, device_pixel_ratio);
|
|
|
|
QPainter painter(&pixmap);
|
|
painter.setRenderHint(QPainter::Antialiasing, true);
|
|
painter.setPen(chrome_icon_pen(color, 1.7));
|
|
|
|
switch (icon) {
|
|
case ChromeIcon::Back:
|
|
draw_back_icon(painter, color);
|
|
break;
|
|
case ChromeIcon::Forward:
|
|
draw_forward_icon(painter, color);
|
|
break;
|
|
case ChromeIcon::Reload: {
|
|
painter.setPen(chrome_icon_pen(color, 1.9));
|
|
QPainterPath path;
|
|
path.arcMoveTo(QRectF(4.0, 4.0, 12.2, 12.2), 34.0);
|
|
path.arcTo(QRectF(4.0, 4.0, 12.2, 12.2), 34.0, 288.0);
|
|
painter.drawPath(path);
|
|
painter.drawLine(QPointF(15.4, 3.7), QPointF(16.0, 7.5));
|
|
painter.drawLine(QPointF(15.4, 3.7), QPointF(11.8, 4.4));
|
|
break;
|
|
}
|
|
case ChromeIcon::Stop:
|
|
painter.setPen(chrome_icon_pen(color, 1.75));
|
|
painter.drawLine(QPointF(6.0, 6.0), QPointF(14.0, 14.0));
|
|
painter.drawLine(QPointF(14.0, 6.0), QPointF(6.0, 14.0));
|
|
break;
|
|
case ChromeIcon::NewTab:
|
|
painter.setPen(chrome_icon_pen(color, 1.9));
|
|
painter.drawLine(QPointF(10.0, 4.3), QPointF(10.0, 15.7));
|
|
painter.drawLine(QPointF(4.3, 10.0), QPointF(15.7, 10.0));
|
|
break;
|
|
case ChromeIcon::Close:
|
|
painter.setPen(chrome_icon_pen(color, 1.9));
|
|
painter.drawLine(QPointF(5.5, 5.9), QPointF(14.5, 14.9));
|
|
painter.drawLine(QPointF(14.5, 5.9), QPointF(5.5, 14.9));
|
|
break;
|
|
case ChromeIcon::Menu:
|
|
painter.setPen(chrome_icon_pen(color, 2.0));
|
|
painter.drawLine(QPointF(3.0, 5.9), QPointF(17.0, 5.9));
|
|
painter.drawLine(QPointF(3.0, 10.9), QPointF(17.0, 10.9));
|
|
painter.drawLine(QPointF(3.0, 15.9), QPointF(17.0, 15.9));
|
|
break;
|
|
case ChromeIcon::Star:
|
|
draw_star_icon(painter, color, false);
|
|
break;
|
|
case ChromeIcon::StarFilled:
|
|
draw_star_icon(painter, color, true);
|
|
break;
|
|
case ChromeIcon::Search:
|
|
painter.setPen(chrome_icon_pen(color, 1.65));
|
|
painter.drawEllipse(QRectF(4.2, 4.0, 9.7, 9.7));
|
|
painter.drawLine(QPointF(12.1, 12.1), QPointF(16.0, 16.0));
|
|
break;
|
|
case ChromeIcon::Globe:
|
|
painter.setPen(chrome_icon_pen(color, 1.75));
|
|
painter.drawEllipse(QRectF(4.4, 4.4, 11.2, 11.2));
|
|
painter.drawLine(QPointF(5.5, 10.0), QPointF(14.5, 10.0));
|
|
painter.drawArc(QRectF(7.1, 4.4, 5.8, 11.2), 90 * 16, 180 * 16);
|
|
painter.drawArc(QRectF(7.1, 4.4, 5.8, 11.2), 270 * 16, 180 * 16);
|
|
break;
|
|
case ChromeIcon::Folder: {
|
|
painter.setPen(chrome_icon_pen(color, 1.6));
|
|
QPainterPath path;
|
|
path.moveTo(2.8, 6.1);
|
|
path.lineTo(7.6, 6.1);
|
|
path.lineTo(9.2, 8.0);
|
|
path.lineTo(17.2, 8.0);
|
|
path.quadTo(18.0, 8.0, 18.0, 8.8);
|
|
path.lineTo(18.0, 15.1);
|
|
path.quadTo(18.0, 15.9, 17.2, 15.9);
|
|
path.lineTo(2.8, 15.9);
|
|
path.quadTo(2.0, 15.9, 2.0, 15.1);
|
|
path.lineTo(2.0, 6.9);
|
|
path.quadTo(2.0, 6.1, 2.8, 6.1);
|
|
path.closeSubpath();
|
|
painter.drawPath(path);
|
|
break;
|
|
}
|
|
case ChromeIcon::ChevronUp:
|
|
painter.setPen(chrome_icon_pen(color, 1.85));
|
|
painter.drawLine(QPointF(5.0, 12.4), QPointF(10.0, 7.4));
|
|
painter.drawLine(QPointF(10.0, 7.4), QPointF(15.0, 12.4));
|
|
break;
|
|
case ChromeIcon::ChevronDown:
|
|
painter.setPen(chrome_icon_pen(color, 1.85));
|
|
painter.drawLine(QPointF(5.0, 7.6), QPointF(10.0, 12.6));
|
|
painter.drawLine(QPointF(10.0, 12.6), QPointF(15.0, 7.6));
|
|
break;
|
|
case ChromeIcon::WindowMinimize:
|
|
painter.setPen(chrome_icon_pen(color, 1.65));
|
|
painter.drawLine(QPointF(5.2, 12.5), QPointF(14.8, 12.5));
|
|
break;
|
|
case ChromeIcon::WindowMaximize:
|
|
painter.setPen(chrome_icon_pen(color, 1.55));
|
|
painter.drawRoundedRect(QRectF(5.0, 5.0, 10.0, 10.0), 1.4, 1.4);
|
|
break;
|
|
case ChromeIcon::WindowRestore:
|
|
painter.setPen(chrome_icon_pen(color, 1.55));
|
|
painter.drawRoundedRect(QRectF(5.1, 7.0, 7.9, 7.9), 1.2, 1.2);
|
|
painter.drawLine(QPointF(7.2, 5.1), QPointF(14.9, 5.1));
|
|
painter.drawLine(QPointF(14.9, 5.1), QPointF(14.9, 12.9));
|
|
break;
|
|
case ChromeIcon::WindowClose:
|
|
painter.setPen(chrome_icon_pen(color, 1.65));
|
|
painter.drawLine(QPointF(5.5, 5.5), QPointF(14.5, 14.5));
|
|
painter.drawLine(QPointF(14.5, 5.5), QPointF(5.5, 14.5));
|
|
break;
|
|
}
|
|
|
|
return pixmap;
|
|
}
|
|
|
|
static QIcon create_y_offset_icon(QIcon const& source, int y_offset)
|
|
{
|
|
constexpr int icon_size = 20;
|
|
|
|
auto create_pixmap = [&](QIcon::Mode mode, int device_pixel_ratio) {
|
|
auto pixmap = create_transparent_icon_pixmap({ icon_size, icon_size }, device_pixel_ratio);
|
|
|
|
QPainter painter(&pixmap);
|
|
painter.drawPixmap(
|
|
QRect(0, y_offset, icon_size, icon_size),
|
|
source.pixmap({ icon_size, icon_size }, static_cast<qreal>(device_pixel_ratio), mode));
|
|
return pixmap;
|
|
};
|
|
|
|
QIcon icon;
|
|
for (auto device_pixel_ratio : ICON_DEVICE_PIXEL_RATIOS) {
|
|
icon.addPixmap(create_pixmap(QIcon::Normal, device_pixel_ratio), QIcon::Normal);
|
|
icon.addPixmap(create_pixmap(QIcon::Active, device_pixel_ratio), QIcon::Active);
|
|
icon.addPixmap(create_pixmap(QIcon::Disabled, device_pixel_ratio), QIcon::Disabled);
|
|
icon.addPixmap(create_pixmap(QIcon::Selected, device_pixel_ratio), QIcon::Selected);
|
|
}
|
|
return icon;
|
|
}
|
|
|
|
QIcon create_chrome_icon(ChromeIcon icon, QPalette const& palette)
|
|
{
|
|
auto normal = ChromeStyle::chrome_button_text(palette);
|
|
auto normal_alpha = 216;
|
|
if (icon == ChromeIcon::Close)
|
|
normal_alpha = 172;
|
|
else if (icon == ChromeIcon::Star)
|
|
normal_alpha = 204;
|
|
else if (icon == ChromeIcon::Globe || icon == ChromeIcon::Search || icon == ChromeIcon::Menu)
|
|
normal_alpha = 196;
|
|
normal.setAlpha(normal_alpha);
|
|
|
|
auto active = ChromeStyle::chrome_button_text(palette);
|
|
active.setAlpha(icon == ChromeIcon::Close ? 220 : 236);
|
|
|
|
auto disabled = ChromeStyle::chrome_muted_text(palette);
|
|
disabled.setAlpha(icon == ChromeIcon::Close ? 78 : 96);
|
|
|
|
QIcon qicon;
|
|
|
|
for (auto device_pixel_ratio : ICON_DEVICE_PIXEL_RATIOS) {
|
|
qicon.addPixmap(create_chrome_icon_pixmap(icon, normal, device_pixel_ratio), QIcon::Normal);
|
|
qicon.addPixmap(create_chrome_icon_pixmap(icon, active, device_pixel_ratio), QIcon::Active);
|
|
qicon.addPixmap(create_chrome_icon_pixmap(icon, disabled, device_pixel_ratio), QIcon::Disabled);
|
|
qicon.addPixmap(create_chrome_icon_pixmap(icon, active, device_pixel_ratio), QIcon::Selected);
|
|
}
|
|
|
|
if (icon == ChromeIcon::NewTab)
|
|
return create_y_offset_icon(qicon, -1);
|
|
return qicon;
|
|
}
|
|
|
|
static QPixmap create_loading_spinner_icon_pixmap(QPalette const& palette, int frame, int device_pixel_ratio)
|
|
{
|
|
static constexpr int icon_size = 16;
|
|
static constexpr int segment_count = 12;
|
|
|
|
auto pixmap = create_transparent_icon_pixmap({ icon_size, icon_size }, device_pixel_ratio);
|
|
|
|
QPainter painter(&pixmap);
|
|
painter.setRenderHint(QPainter::Antialiasing);
|
|
painter.translate(icon_size / 2.0, icon_size / 2.0);
|
|
|
|
auto color = ChromeStyle::chrome_text(palette);
|
|
for (int segment = 0; segment < segment_count; ++segment) {
|
|
auto segment_color = color;
|
|
segment_color.setAlpha(((segment - frame + segment_count) % segment_count + 1) * 255 / segment_count);
|
|
|
|
painter.save();
|
|
painter.rotate(segment * 360.0 / segment_count);
|
|
painter.setPen(QPen(segment_color, 2, Qt::SolidLine, Qt::RoundCap));
|
|
painter.drawLine(QPointF(0, -4), QPointF(0, -7));
|
|
painter.restore();
|
|
}
|
|
|
|
return pixmap;
|
|
}
|
|
|
|
QIcon loading_spinner_icon(QPalette const& palette, int frame)
|
|
{
|
|
QIcon icon;
|
|
for (auto device_pixel_ratio : ICON_DEVICE_PIXEL_RATIOS)
|
|
icon.addPixmap(create_loading_spinner_icon_pixmap(palette, frame, device_pixel_ratio));
|
|
return icon;
|
|
}
|
|
|
|
QSize physical_size_for_device_pixel_ratio(QSize size, qreal device_pixel_ratio)
|
|
{
|
|
return {
|
|
static_cast<int>(ceil(size.width() * device_pixel_ratio)),
|
|
static_cast<int>(ceil(size.height() * device_pixel_ratio)),
|
|
};
|
|
}
|
|
|
|
}
|