Apply app color scheme, test dynamic header.
This commit is contained in:
John Preston
parent
212259aae3
commit
f9299eee2a
5 changed files with 727 additions and 549 deletions
|
|
@ -4,7 +4,30 @@ body {
|
|||
line-height: 25px;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
background-color: var(--td-window-bg);
|
||||
color: var(--td-window-fg);
|
||||
}
|
||||
|
||||
html.custom_scroll ::-webkit-scrollbar {
|
||||
border-radius: 5px !important;
|
||||
border: 3px solid transparent !important;
|
||||
background-color: var(--td-scroll-bg) !important;
|
||||
background-clip: content-box !important;
|
||||
width: 10px !important;
|
||||
}
|
||||
html.custom_scroll ::-webkit-scrollbar:hover {
|
||||
background-color: var(--td-scroll-bg-over) !important;
|
||||
}
|
||||
html.custom_scroll ::-webkit-scrollbar-thumb {
|
||||
border-radius: 5px !important;
|
||||
border: 3px solid transparent !important;
|
||||
background-color: var(--td-scroll-bar-bg) !important;
|
||||
background-clip: content-box !important;
|
||||
}
|
||||
html.custom_scroll ::-webkit-scrollbar-thumb:hover {
|
||||
background-color: var(--td-scroll-bar-bg-over) !important;
|
||||
}
|
||||
|
||||
article {
|
||||
padding-bottom: 12px;
|
||||
overflow: hidden;
|
||||
|
|
@ -25,22 +48,11 @@ article h2 {
|
|||
font-size: 24px;
|
||||
line-height: 30px;
|
||||
margin: -6px 18px 12px;
|
||||
color: #777;
|
||||
}
|
||||
article h6.kicker {
|
||||
font-family: 'Helvetica Neue';
|
||||
font-size: 14px;
|
||||
line-height: 17px;
|
||||
margin: 21px 18px 12px;
|
||||
font-weight: 500;
|
||||
color: #79828B;
|
||||
}
|
||||
article h6.kicker + h1 {
|
||||
margin-top: 12px;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
article address {
|
||||
font-size: 15px;
|
||||
color: #79828B;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
margin: 12px 18px 21px;
|
||||
font-style: normal;
|
||||
}
|
||||
|
|
@ -59,17 +71,17 @@ article address figure {
|
|||
}
|
||||
article address a,
|
||||
article address a[href] {
|
||||
color: #79828B;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
article address a[href] {
|
||||
text-decoration: underline;
|
||||
}
|
||||
article a[href] {
|
||||
color: #007EE5;
|
||||
color: var(--td-window-active-text-fg);
|
||||
text-decoration: none;
|
||||
}
|
||||
article span.reference {
|
||||
border: dotted #ddd;
|
||||
border: dotted var(--td-window-sub-text-fg);
|
||||
border-width: 1px 1px 1px 2px;
|
||||
background: rgba(255, 255, 255, 0.7);
|
||||
margin: 0 1px;
|
||||
|
|
@ -81,12 +93,13 @@ article.rtl span.reference {
|
|||
}
|
||||
article code {
|
||||
font-size: 0.94em;
|
||||
background: #eee;
|
||||
background: var(--td-box-divider-bg);
|
||||
border-radius: 2px;
|
||||
padding: 0 3px 1px;
|
||||
}
|
||||
article mark {
|
||||
background: #fcf8e3;
|
||||
background: var(--td-window-bg-over);
|
||||
color: var(--td-window-fg);
|
||||
border-radius: 2px;
|
||||
padding: 0 3px 1px;
|
||||
}
|
||||
|
|
@ -166,7 +179,7 @@ article blockquote:before {
|
|||
top: 3px;
|
||||
bottom: 3px;
|
||||
width: 3px;
|
||||
background-color: #000;
|
||||
background-color: var(--td-window-bg-active);
|
||||
border-radius: 3px;
|
||||
}
|
||||
article.rtl blockquote {
|
||||
|
|
@ -197,7 +210,7 @@ article .iv-pullquote cite {
|
|||
font-family: 'Helvetica Neue';
|
||||
font-size: 15px;
|
||||
display: block;
|
||||
color: #79828B;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
line-height: 19px;
|
||||
padding: 5px 0 2px;
|
||||
font-style: normal;
|
||||
|
|
@ -215,7 +228,7 @@ article ol hr {
|
|||
article hr:before {
|
||||
content: '';
|
||||
display: block;
|
||||
border-top: 1px solid #c9cdd1;
|
||||
border-top: 1px solid var(--td-window-sub-text-fg);
|
||||
padding: 0 0 2px;
|
||||
}
|
||||
article footer hr {
|
||||
|
|
@ -272,17 +285,17 @@ article table {
|
|||
article table.bordered,
|
||||
article table.bordered td,
|
||||
article table.bordered th {
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid var(--td-box-divider-fg);
|
||||
}
|
||||
article table.striped tr:nth-child(odd) td {
|
||||
background-color: #f7f7f7;
|
||||
background-color: var(--td-box-divider-bg);
|
||||
}
|
||||
article table caption {
|
||||
font-size: 15px;
|
||||
line-height: 18px;
|
||||
margin: 4px 0 7px;
|
||||
text-align: left;
|
||||
color: #79828B;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
article.rtl table caption {
|
||||
text-align: right;
|
||||
|
|
@ -292,13 +305,13 @@ article th {
|
|||
font-size: 15px;
|
||||
line-height: 21px;
|
||||
padding: 6px 5px 5px;
|
||||
background-color: #fff;
|
||||
background-color: var(--td-window-bg);
|
||||
vertical-align: middle;
|
||||
font-weight: normal;
|
||||
text-align: left;
|
||||
}
|
||||
article th {
|
||||
background-color: #efefef;
|
||||
background-color: var(--td-box-divider-bg);
|
||||
}
|
||||
article.rtl table td,
|
||||
article.rtl table th {
|
||||
|
|
@ -312,7 +325,7 @@ article details {
|
|||
article details:before {
|
||||
content: '';
|
||||
display: block;
|
||||
border-bottom: 1px solid #c8c7cb;
|
||||
border-bottom: 1px solid var(--td-box-divider-fg);
|
||||
position: absolute;
|
||||
left: 18px;
|
||||
right: 0;
|
||||
|
|
@ -401,7 +414,7 @@ audio {
|
|||
img {
|
||||
font-size: 12px;
|
||||
line-height: 14px;
|
||||
color: #999;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
img.pic {
|
||||
max-height: none;
|
||||
|
|
@ -455,7 +468,7 @@ figure > figure {
|
|||
}
|
||||
figcaption {
|
||||
font-size: 15px;
|
||||
color: #79828B;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
padding: 6px 18px 0;
|
||||
line-height: 19px;
|
||||
text-align: left;
|
||||
|
|
@ -478,7 +491,7 @@ figcaption > cite {
|
|||
}
|
||||
footer {
|
||||
margin: 12px 18px;
|
||||
color: #79828B;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
|
||||
figure.slideshow-wrap {
|
||||
|
|
@ -658,7 +671,7 @@ blockquote.embed-post address a {
|
|||
padding-top: 2px;
|
||||
font-size: 17px;
|
||||
font-weight: 600;
|
||||
color: #000;
|
||||
color: var(--td-window-fg);
|
||||
}
|
||||
blockquote.embed-post address time {
|
||||
display: block;
|
||||
|
|
@ -689,7 +702,7 @@ section.embed-post {
|
|||
display: block;
|
||||
width: auto;
|
||||
height: auto;
|
||||
background: #f7f7f7;
|
||||
background: var(--td-box-divider-bg);
|
||||
margin: 0 18px 12px;
|
||||
padding: 24px 18px;
|
||||
text-align: center;
|
||||
|
|
@ -698,11 +711,11 @@ section.embed-post strong {
|
|||
font-size: 21px;
|
||||
font-weight: normal;
|
||||
display: block;
|
||||
color: #777;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
section.embed-post small {
|
||||
display: block;
|
||||
color: #777;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
|
||||
section.related {
|
||||
|
|
@ -715,21 +728,21 @@ section.related h4 {
|
|||
font-weight: 500;
|
||||
display: block;
|
||||
padding: 7px 18px;
|
||||
background: #f7f7f7;
|
||||
background: var(--td-box-divider-bg);
|
||||
margin: 0;
|
||||
color: #000;
|
||||
color: var(--td-window-fg);
|
||||
}
|
||||
section.related a.related-link {
|
||||
display: block;
|
||||
padding: 15px 18px 16px;
|
||||
background: #fff;
|
||||
background: var(--td-window-bg);
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
section.related a.related-link:after {
|
||||
content: '';
|
||||
display: block;
|
||||
border-bottom: 1px solid #c8c7cb;
|
||||
border-bottom: 1px solid var(--td-box-divider-fg);
|
||||
position: absolute;
|
||||
left: 18px;
|
||||
right: 0;
|
||||
|
|
@ -740,7 +753,7 @@ section.related .related-link-url {
|
|||
font-size: 15px;
|
||||
line-height: 18px;
|
||||
padding: 7px 0;
|
||||
color: #999;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
word-break: break-word;
|
||||
}
|
||||
section.related .related-link-thumb {
|
||||
|
|
@ -770,7 +783,7 @@ section.related .related-link-title {
|
|||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: pre-wrap;
|
||||
color: #000;
|
||||
color: var(--td-window-fg);
|
||||
}
|
||||
section.related .related-link-desc {
|
||||
font-size: 14px;
|
||||
|
|
@ -783,7 +796,7 @@ section.related .related-link-desc {
|
|||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: pre-wrap;
|
||||
color: #000;
|
||||
color: var(--td-window-fg);
|
||||
}
|
||||
section.related .related-link-source {
|
||||
font-size: 13px;
|
||||
|
|
@ -793,7 +806,7 @@ section.related .related-link-source {
|
|||
margin-top: 4px;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: #818181;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
|
||||
section.message {
|
||||
|
|
@ -811,7 +824,7 @@ section.message > aside {
|
|||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
text-align: center;
|
||||
color: #999;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
font-size: 24px;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
|
@ -820,7 +833,7 @@ section.message > aside > cite {
|
|||
font-size: 14px;
|
||||
padding: 10px 0 0;
|
||||
font-style: normal;
|
||||
color: #ccc;
|
||||
color: var(--td-window-sub-text-fg);
|
||||
}
|
||||
|
||||
section.channel {
|
||||
|
|
@ -833,11 +846,11 @@ section.channel:first-child {
|
|||
section.channel > a {
|
||||
display: block;
|
||||
padding: 7px 18px;
|
||||
background: #f7f7f7;
|
||||
background: var(--td-box-divider-bg);
|
||||
}
|
||||
section.channel > a:before {
|
||||
content: 'Join';
|
||||
color: #3196e8;
|
||||
content: var(--td-lng-group-call-join);
|
||||
color: var(--td-window-active-text-fg);
|
||||
font-weight: 500;
|
||||
margin-left: 7px;
|
||||
float: right;
|
||||
|
|
@ -848,7 +861,7 @@ section.channel > a > h4 {
|
|||
line-height: 26px;
|
||||
font-weight: 500;
|
||||
margin: 0;
|
||||
color: #000;
|
||||
color: var(--td-window-fg);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
|
|
|||
|
|
@ -49,15 +49,13 @@ var IV = {
|
|||
});
|
||||
}
|
||||
},
|
||||
postMessageHandler: function(event) {
|
||||
if (event.source !== window.parent ||
|
||||
event.origin != window.parentOrigin) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
var data = JSON.parse(event.data);
|
||||
} catch(e) {
|
||||
var data = {};
|
||||
updateStyles: function (styles) {
|
||||
if (IV.styles !== styles) {
|
||||
console.log('Setting', styles);
|
||||
IV.styles = styles;
|
||||
document.getElementsByTagName('html')[0].style = styles;
|
||||
} else {
|
||||
console.log('Skipping', styles);
|
||||
}
|
||||
},
|
||||
slideshowSlide: function(el, next) {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include "iv/iv_controller.h"
|
||||
|
||||
#include "base/platform/base_platform_info.h"
|
||||
#include "base/invoke_queued.h"
|
||||
#include "iv/iv_data.h"
|
||||
#include "lang/lang_keys.h"
|
||||
#include "ui/widgets/rp_window.h"
|
||||
#include "webview/webview_data_stream_memory.h"
|
||||
#include "webview/webview_embed.h"
|
||||
#include "webview/webview_interface.h"
|
||||
#include "styles/palette.h"
|
||||
|
||||
#include "base/call_delayed.h"
|
||||
#include "ui/effects/animations.h"
|
||||
|
||||
#include <QtCore/QRegularExpression>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
|
@ -23,8 +28,99 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include <QtGui/QPainter>
|
||||
|
||||
namespace Iv {
|
||||
namespace {
|
||||
|
||||
Controller::Controller() = default;
|
||||
[[nodiscard]] QByteArray ComputeStyles() {
|
||||
static const auto map = base::flat_map<QByteArray, const style::color*>{
|
||||
{ "scroll-bg", &st::scrollBg },
|
||||
{ "scroll-bg-over", &st::scrollBgOver },
|
||||
{ "scroll-bar-bg", &st::scrollBarBg },
|
||||
{ "scroll-bar-bg-over", &st::scrollBarBgOver },
|
||||
{ "window-bg", &st::windowBg },
|
||||
{ "window-bg-over", &st::windowBgOver },
|
||||
{ "window-bg-ripple", &st::windowBgRipple },
|
||||
{ "window-fg", &st::windowFg },
|
||||
{ "window-sub-text-fg", &st::windowSubTextFg },
|
||||
{ "window-active-text-fg", &st::windowActiveTextFg },
|
||||
{ "window-bg-active", &st::windowBgActive },
|
||||
{ "box-divider-bg", &st::boxDividerBg },
|
||||
{ "box-divider-fg", &st::boxDividerFg },
|
||||
};
|
||||
static const auto phrases = base::flat_map<QByteArray, tr::phrase<>>{
|
||||
{ "group-call-join", tr::lng_group_call_join },
|
||||
};
|
||||
static const auto serialize = [](const style::color *color) {
|
||||
const auto qt = (*color)->c;
|
||||
if (qt.alpha() == 255) {
|
||||
return '#'
|
||||
+ QByteArray::number(qt.red(), 16).right(2)
|
||||
+ QByteArray::number(qt.green(), 16).right(2)
|
||||
+ QByteArray::number(qt.blue(), 16).right(2);
|
||||
}
|
||||
return "rgba("
|
||||
+ QByteArray::number(qt.red()) + ","
|
||||
+ QByteArray::number(qt.green()) + ","
|
||||
+ QByteArray::number(qt.blue()) + ","
|
||||
+ QByteArray::number(qt.alpha() / 255.) + ")";
|
||||
};
|
||||
static const auto escape = [](tr::phrase<> phrase) {
|
||||
const auto text = phrase(tr::now);
|
||||
|
||||
auto result = QByteArray();
|
||||
for (auto i = 0; i != text.size(); ++i) {
|
||||
uint ucs4 = text[i].unicode();
|
||||
if (QChar::isHighSurrogate(ucs4) && i + 1 != text.size()) {
|
||||
ushort low = text[i + 1].unicode();
|
||||
if (QChar::isLowSurrogate(low)) {
|
||||
ucs4 = QChar::surrogateToUcs4(ucs4, low);
|
||||
++i;
|
||||
}
|
||||
}
|
||||
if (ucs4 == '\'' || ucs4 == '\"' || ucs4 == '\\') {
|
||||
result.append('\\').append(char(ucs4));
|
||||
} else if (ucs4 < 32 || ucs4 > 127) {
|
||||
result.append('\\' + QByteArray::number(ucs4, 16) + ' ');
|
||||
} else {
|
||||
result.append(char(ucs4));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
};
|
||||
auto result = QByteArray();
|
||||
for (const auto &[name, phrase] : phrases) {
|
||||
result += "--td-lng-" + name + ":'" + escape(phrase) + "'; ";
|
||||
}
|
||||
for (const auto &[name, color] : map) {
|
||||
result += "--td-" + name + ':' + serialize(color) + ';';
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
[[nodiscard]] QByteArray EscapeForAttribute(QByteArray value) {
|
||||
return value
|
||||
.replace('&', "&")
|
||||
.replace('"', """)
|
||||
.replace('\'', "'")
|
||||
.replace('<', "<")
|
||||
.replace('>', ">");
|
||||
}
|
||||
|
||||
[[nodiscard]] QByteArray EscapeForScriptString(QByteArray value) {
|
||||
return value
|
||||
.replace('\\', "\\\\")
|
||||
.replace('"', "\\\"")
|
||||
.replace('\'', "\\\'");
|
||||
}
|
||||
|
||||
} // namespace
|
||||
Controller::Controller()
|
||||
: _updateStyles([=] {
|
||||
const auto str = EscapeForScriptString(ComputeStyles());
|
||||
if (_webview) {
|
||||
_webview->eval("IV.updateStyles(\"" + str + "\");");
|
||||
}
|
||||
}) {
|
||||
}
|
||||
|
||||
Controller::~Controller() {
|
||||
_webview = nullptr;
|
||||
|
|
@ -32,21 +128,66 @@ Controller::~Controller() {
|
|||
}
|
||||
|
||||
void Controller::show(const QString &dataPath, Prepared page) {
|
||||
createWindow();
|
||||
InvokeQueued(_container, [=, page = std::move(page)]() mutable {
|
||||
showInWindow(dataPath, std::move(page));
|
||||
});
|
||||
}
|
||||
|
||||
void Controller::createWindow() {
|
||||
_window = std::make_unique<Ui::RpWindow>();
|
||||
const auto window = _window.get();
|
||||
|
||||
window->setGeometry({ 200, 200, 600, 800 });
|
||||
|
||||
const auto container = Ui::CreateChild<Ui::RpWidget>(
|
||||
window->body().get());
|
||||
window->sizeValue() | rpl::start_with_next([=](QSize size) {
|
||||
container->setGeometry(QRect(QPoint(), size));
|
||||
}, container->lifetime());
|
||||
container->show();
|
||||
const auto skip = window->lifetime().make_state<rpl::variable<int>>(0);
|
||||
|
||||
_container = Ui::CreateChild<Ui::RpWidget>(window->body().get());
|
||||
rpl::combine(
|
||||
window->body()->sizeValue(),
|
||||
skip->value()
|
||||
) | rpl::start_with_next([=](QSize size, int skip) {
|
||||
_container->setGeometry(QRect(QPoint(), size).marginsRemoved({ 0, skip, 0, 0 }));
|
||||
}, _container->lifetime());
|
||||
|
||||
base::call_delayed(5000, window, [=] {
|
||||
const auto animation = window->lifetime().make_state<Ui::Animations::Simple>();
|
||||
animation->start([=] {
|
||||
*skip = animation->value(64);
|
||||
if (!animation->animating()) {
|
||||
base::call_delayed(4000, window, [=] {
|
||||
animation->start([=] {
|
||||
*skip = animation->value(0);
|
||||
}, 64, 0, 200, anim::easeOutCirc);
|
||||
});
|
||||
}
|
||||
}, 0, 64, 200, anim::easeOutCirc);
|
||||
});
|
||||
|
||||
window->body()->paintRequest() | rpl::start_with_next([=](QRect clip) {
|
||||
auto p = QPainter(window->body());
|
||||
p.fillRect(clip, st::windowBg);
|
||||
p.fillRect(clip, QColor(0, 128, 0, 128));
|
||||
}, window->body()->lifetime());
|
||||
|
||||
_container->paintRequest() | rpl::start_with_next([=](QRect clip) {
|
||||
QPainter(_container).fillRect(clip, st::windowBg);
|
||||
}, _container->lifetime());
|
||||
|
||||
_container->show();
|
||||
window->show();
|
||||
}
|
||||
|
||||
void Controller::showInWindow(const QString &dataPath, Prepared page) {
|
||||
Expects(_container != nullptr);
|
||||
|
||||
const auto window = _window.get();
|
||||
_webview = std::make_unique<Webview::Window>(
|
||||
container,
|
||||
Webview::WindowConfig{ .userDataPath = dataPath });
|
||||
_container,
|
||||
Webview::WindowConfig{
|
||||
.opaqueBg = st::windowBg->c,
|
||||
.userDataPath = dataPath,
|
||||
});
|
||||
const auto raw = _webview.get();
|
||||
|
||||
window->lifetime().add([=] {
|
||||
|
|
@ -69,14 +210,10 @@ void Controller::show(const QString &dataPath, Prepared page) {
|
|||
}, window->lifetime());
|
||||
raw->widget()->show();
|
||||
|
||||
container->geometryValue(
|
||||
) | rpl::start_with_next([=](QRect geometry) {
|
||||
raw->widget()->setGeometry(geometry);
|
||||
}, container->lifetime());
|
||||
|
||||
container->paintRequest() | rpl::start_with_next([=](QRect clip) {
|
||||
QPainter(container).fillRect(clip, st::windowBg);
|
||||
}, container->lifetime());
|
||||
_container->sizeValue(
|
||||
) | rpl::start_with_next([=](QSize size) {
|
||||
raw->widget()->setGeometry(QRect(QPoint(), size));
|
||||
}, _container->lifetime());
|
||||
|
||||
raw->setNavigationStartHandler([=](const QString &uri, bool newWindow) {
|
||||
return true;
|
||||
|
|
@ -118,7 +255,22 @@ void Controller::show(const QString &dataPath, Prepared page) {
|
|||
};
|
||||
const auto id = std::string_view(request.id).substr(3);
|
||||
if (id == "page.html") {
|
||||
return finishWith(page.html, "text/html");
|
||||
const auto i = page.html.indexOf("<html"_q);
|
||||
Assert(i >= 0);
|
||||
const auto colored = page.html.mid(0, i + 5)
|
||||
+ " style=\"" + EscapeForAttribute(ComputeStyles()) + "\""
|
||||
+ page.html.mid(i + 5);
|
||||
if (!_subscribedToColors) {
|
||||
_subscribedToColors = true;
|
||||
|
||||
rpl::merge(
|
||||
Lang::Updated(),
|
||||
style::PaletteChanged()
|
||||
) | rpl::start_with_next([=] {
|
||||
_updateStyles.call();
|
||||
}, _webview->lifetime());
|
||||
}
|
||||
return finishWith(colored, "text/html");
|
||||
}
|
||||
const auto css = id.ends_with(".css");
|
||||
const auto js = !css && id.ends_with(".js");
|
||||
|
|
@ -140,8 +292,6 @@ void Controller::show(const QString &dataPath, Prepared page) {
|
|||
raw->init(R"(
|
||||
)");
|
||||
raw->navigateToData("iv/page.html");
|
||||
|
||||
window->show();
|
||||
}
|
||||
|
||||
bool Controller::active() const {
|
||||
|
|
|
|||
|
|
@ -7,12 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "base/invoke_queued.h"
|
||||
|
||||
namespace Webview {
|
||||
struct DataRequest;
|
||||
class Window;
|
||||
} // namespace Webview
|
||||
|
||||
namespace Ui {
|
||||
class RpWidget;
|
||||
class RpWindow;
|
||||
} // namespace Ui
|
||||
|
||||
|
|
@ -45,14 +48,21 @@ public:
|
|||
[[nodiscard]] rpl::lifetime &lifetime();
|
||||
|
||||
private:
|
||||
void createWindow();
|
||||
void showInWindow(const QString &dataPath, Prepared page);
|
||||
|
||||
void escape();
|
||||
void close();
|
||||
void quit();
|
||||
|
||||
std::unique_ptr<Ui::RpWindow> _window;
|
||||
Ui::RpWidget *_container = nullptr;
|
||||
std::unique_ptr<Webview::Window> _webview;
|
||||
rpl::event_stream<Webview::DataRequest> _dataRequests;
|
||||
rpl::event_stream<Event> _events;
|
||||
SingleQueuedInvokation _updateStyles;
|
||||
bool _subscribedToColors = false;
|
||||
|
||||
rpl::lifetime _lifetime;
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|||
#include "iv/iv_data.h"
|
||||
#include "lang/lang_keys.h"
|
||||
#include "ui/image/image_prepare.h"
|
||||
#include "styles/palette.h"
|
||||
|
||||
#include <QtCore/QSize>
|
||||
|
||||
|
|
@ -1009,8 +1010,14 @@ QByteArray Parser::prepare(QByteArray body) {
|
|||
}
|
||||
|
||||
QByteArray Parser::html(const QByteArray &head, const QByteArray &body) {
|
||||
#ifdef Q_OS_MAC
|
||||
const auto classAttribute = ""_q;
|
||||
#else // Q_OS_MAC
|
||||
const auto classAttribute = " class=\"custom_scroll\""_q;
|
||||
#endif // Q_OS_MAC
|
||||
|
||||
return R"(<!DOCTYPE html>
|
||||
<html>
|
||||
<html)"_q + classAttribute + R"(">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="robots" content="noindex, nofollow">
|
||||
|
|
|
|||
Loading…
Reference in a new issue