mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Beta version 3.3.2: Fix build with GCC.
This commit is contained in:
parent
67fa58edc4
commit
2c20e7bb02
9 changed files with 0 additions and 30 deletions
|
@ -241,7 +241,6 @@ struct State {
|
||||||
[[nodiscard]] rpl::producer<std::vector<PeerWithReaction>> WhoReactedIds(
|
[[nodiscard]] rpl::producer<std::vector<PeerWithReaction>> WhoReactedIds(
|
||||||
not_null<HistoryItem*> item,
|
not_null<HistoryItem*> item,
|
||||||
not_null<QWidget*> context) {
|
not_null<QWidget*> context) {
|
||||||
auto unknown = item->history()->session().userPeerId();
|
|
||||||
auto weak = QPointer<QWidget>(context.get());
|
auto weak = QPointer<QWidget>(context.get());
|
||||||
const auto session = &item->history()->session();
|
const auto session = &item->history()->session();
|
||||||
return [=](auto consumer) {
|
return [=](auto consumer) {
|
||||||
|
|
|
@ -76,7 +76,6 @@ void AddReactionIcon(
|
||||||
icon->paintRequest(
|
icon->paintRequest(
|
||||||
) | rpl::start_with_next([=] {
|
) | rpl::start_with_next([=] {
|
||||||
Painter p(icon);
|
Painter p(icon);
|
||||||
const auto width = icon->width();
|
|
||||||
if (!state->image.isNull()) {
|
if (!state->image.isNull()) {
|
||||||
p.drawImage(0, 0, state->image);
|
p.drawImage(0, 0, state->image);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3002,7 +3002,6 @@ void HistoryInner::mouseActionUpdate() {
|
||||||
: nullptr;
|
: nullptr;
|
||||||
const auto item = view ? view->data().get() : nullptr;
|
const auto item = view ? view->data().get() : nullptr;
|
||||||
if (view) {
|
if (view) {
|
||||||
const auto was = App::mousedItem();
|
|
||||||
App::mousedItem(view);
|
App::mousedItem(view);
|
||||||
m = mapPointToItem(point, view);
|
m = mapPointToItem(point, view);
|
||||||
_reactionsManager->updateButton(reactionButtonParameters(
|
_reactionsManager->updateButton(reactionButtonParameters(
|
||||||
|
|
|
@ -127,7 +127,6 @@ void BottomInfo::paint(
|
||||||
bool inverted,
|
bool inverted,
|
||||||
const PaintContext &context) const {
|
const PaintContext &context) const {
|
||||||
const auto st = context.st;
|
const auto st = context.st;
|
||||||
const auto sti = context.imageStyle();
|
|
||||||
const auto stm = context.messageStyle();
|
const auto stm = context.messageStyle();
|
||||||
|
|
||||||
auto right = position.x() + width();
|
auto right = position.x() + width();
|
||||||
|
|
|
@ -1845,7 +1845,6 @@ Reactions::ButtonParameters Message::reactionButtonParameters(
|
||||||
const auto geometry = countGeometry();
|
const auto geometry = countGeometry();
|
||||||
result.pointer = position;
|
result.pointer = position;
|
||||||
const auto onTheLeft = (outbg && !delegate()->elementIsChatWide());
|
const auto onTheLeft = (outbg && !delegate()->elementIsChatWide());
|
||||||
const auto leftAdd = onTheLeft ? 0 : geometry.width();
|
|
||||||
|
|
||||||
const auto keyboard = data()->inlineReplyKeyboard();
|
const auto keyboard = data()->inlineReplyKeyboard();
|
||||||
const auto keyboardHeight = keyboard
|
const auto keyboardHeight = keyboard
|
||||||
|
|
|
@ -56,26 +56,6 @@ constexpr auto kButtonExpandDelay = crl::time(300);
|
||||||
return CountMaxSizeWithMargins(st::reactionCornerShadow);
|
return CountMaxSizeWithMargins(st::reactionCornerShadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CopyImagePart(QImage &to, const QImage &from, QRect source) {
|
|
||||||
Expects(to.size() == source.size());
|
|
||||||
Expects(QRect(QPoint(), from.size()).contains(source));
|
|
||||||
Expects(to.format() == from.format());
|
|
||||||
Expects(to.bytesPerLine() == to.width() * 4);
|
|
||||||
|
|
||||||
const auto perPixel = 4;
|
|
||||||
const auto fromPerLine = from.bytesPerLine();
|
|
||||||
const auto toPerLine = to.bytesPerLine();
|
|
||||||
auto toBytes = reinterpret_cast<char*>(to.bits());
|
|
||||||
auto fromBytes = reinterpret_cast<const char*>(from.bits())
|
|
||||||
+ (source.y() * fromPerLine)
|
|
||||||
+ (source.x() * perPixel);
|
|
||||||
for (auto y = 0, height = source.height(); y != height; ++y) {
|
|
||||||
memcpy(toBytes, fromBytes, toPerLine);
|
|
||||||
toBytes += toPerLine;
|
|
||||||
fromBytes += fromPerLine;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
Button::Button(
|
Button::Button(
|
||||||
|
@ -673,7 +653,6 @@ void Manager::paintAllEmoji(
|
||||||
const auto shift = QPoint(0, oneHeight * (expandUp ? -1 : 1));
|
const auto shift = QPoint(0, oneHeight * (expandUp ? -1 : 1));
|
||||||
auto emojiPosition = mainEmojiPosition
|
auto emojiPosition = mainEmojiPosition
|
||||||
+ QPoint(0, button->scroll() * (expandUp ? 1 : -1));
|
+ QPoint(0, button->scroll() * (expandUp ? 1 : -1));
|
||||||
auto index = 0;
|
|
||||||
for (const auto &reaction : _list) {
|
for (const auto &reaction : _list) {
|
||||||
const auto inner = QRectF(_inner).translated(emojiPosition);
|
const auto inner = QRectF(_inner).translated(emojiPosition);
|
||||||
const auto target = QRectF(
|
const auto target = QRectF(
|
||||||
|
|
|
@ -176,7 +176,6 @@ void InlineList::paint(
|
||||||
const QRect &clip) const {
|
const QRect &clip) const {
|
||||||
const auto st = context.st;
|
const auto st = context.st;
|
||||||
const auto stm = context.messageStyle();
|
const auto stm = context.messageStyle();
|
||||||
const auto between = st::reactionBottomBetween;
|
|
||||||
const auto padding = st::reactionBottomPadding;
|
const auto padding = st::reactionBottomPadding;
|
||||||
const auto size = st::reactionBottomSize;
|
const auto size = st::reactionBottomSize;
|
||||||
const auto inbubble = (_data.flags & InlineListData::Flag::InBubble);
|
const auto inbubble = (_data.flags & InlineListData::Flag::InBubble);
|
||||||
|
|
|
@ -225,8 +225,6 @@ void Document::fillNamedFromData(HistoryDocumentNamed *named) {
|
||||||
}
|
}
|
||||||
|
|
||||||
QSize Document::countOptimalSize() {
|
QSize Document::countOptimalSize() {
|
||||||
const auto item = _parent->data();
|
|
||||||
|
|
||||||
auto captioned = Get<HistoryDocumentCaptioned>();
|
auto captioned = Get<HistoryDocumentCaptioned>();
|
||||||
if (_parent->media() != this && !_realParent->groupId()) {
|
if (_parent->media() != this && !_realParent->groupId()) {
|
||||||
if (captioned) {
|
if (captioned) {
|
||||||
|
|
|
@ -178,7 +178,6 @@ void Controller::loadMore(const QString &offset) {
|
||||||
|
|
||||||
void Controller::rowClicked(not_null<PeerListRow*> row) {
|
void Controller::rowClicked(not_null<PeerListRow*> row) {
|
||||||
const auto peerId = row->peer()->id;
|
const auto peerId = row->peer()->id;
|
||||||
const auto window = _window;
|
|
||||||
crl::on_main(&session(), [=] {
|
crl::on_main(&session(), [=] {
|
||||||
_window->showPeerHistory(peerId);
|
_window->showPeerHistory(peerId);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue