FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-25 06:54:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[img-editor] Restyled popups and sticker panel as mediaview dark theme.

Browse Source
This commit is contained in:
23rd
2026-04-23 21:08:43 +03:00
parent 697f5b77b5
commit fdf75eebf3
6 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ StickersPanelController::StickersPanelController(
nullptr,
ChatHelpers::TabbedSelectorDescriptor{
.show = show,
.st = st::storiesComposeControls.tabbed,
.st = st::mediaviewEmojiPan,
.level = Window::GifPauseReason::Layer,
.mode = ChatHelpers::TabbedSelector::Mode::MediaEditor,
.features = {
Telegram/SourceFiles/editor/editor.style
+7 -2
View File
@@ -10,6 +10,7 @@ using "ui/basic.style";
using "window/window.style";
using "ui/widgets/widgets.style";
using "ui/chat/chat.style";
using "media/view/media_view.style";
// photoEditorControlsBottomSkip * 2 + photoEditorControlsCenterSkip + photoEditorButtonBarHeight * 2
photoEditorControlsHeight: 146px;
@@ -106,12 +107,16 @@ photoEditorCornersMenuAboutLabel: FlatLabel(defaultFlatLabel) {
font: font(11px);
}
minWidth: 136px;
textFg: groupCallMemberNotJoinedStatus;
}
photoEditorCornersMenuAboutPosition: point(12px, 4px);
photoEditorCropRatioMenu: PopupMenu(popupMenuWithIcons) {
menu: Menu(menuWithIcons) {
photoEditorMenuSubmenuArrow: icon {{ "menu/submenu_arrow", groupCallMemberNotJoinedStatus }};
photoEditorCropRatioMenu: PopupMenu(mediaviewPopupMenu) {
menu: Menu(mediaviewMenu) {
widthMin: 108px;
arrow: photoEditorMenuSubmenuArrow;
}
}
Telegram/SourceFiles/editor/scene/scene_item_base.cpp
+5 -4
View File
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/widgets/popup_menu.h"
#include "ui/painter.h"
#include "styles/style_editor.h"
#include "styles/style_media_view.h"
#include "styles/style_menu_icons.h"
#include <QGraphicsScene>
@@ -211,22 +212,22 @@ void ItemBase::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
_menu = base::make_unique_q<Ui::PopupMenu>(
nullptr,
st::popupMenuWithIcons);
st::mediaviewPopupMenu);
add(
tr::lng_photo_editor_menu_delete,
kDeleteSequence,
[=] { actionDelete(); },
&st::menuIconDelete);
&st::mediaMenuIconDelete);
add(
tr::lng_photo_editor_menu_flip,
kFlipSequence,
[=] { actionFlip(); },
&st::menuIconFlip);
&st::mediaMenuIconFlip);
add(
tr::lng_photo_editor_menu_duplicate,
kDuplicateSequence,
[=] { actionDuplicate(); },
&st::menuIconCopy);
&st::mediaMenuIconCopy);
_menu->popup(event->screenPos());
}
Telegram/SourceFiles/editor/scene/scene_item_text.cpp
+7 -6
View File
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/painter.h"
#include "ui/widgets/popup_menu.h"
#include "styles/style_editor.h"
#include "styles/style_media_view.h"
#include "styles/style_menu_icons.h"
#include <QGraphicsSceneMouseEvent>
@@ -587,7 +588,7 @@ void ItemText::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
_contextMenu = base::make_unique_q<Ui::PopupMenu>(
nullptr,
st::popupMenuWithIcons);
st::mediaviewPopupMenu);
const auto add = [&](
const QString &text,
TextStyle style,
@@ -604,26 +605,26 @@ void ItemText::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
add(
tr::lng_photo_editor_text_style_plain(tr::now),
TextStyle::Plain,
&st::menuIconTextStylePlain);
&st::mediaMenuIconTextStylePlain);
add(
tr::lng_photo_editor_text_style_framed(tr::now),
TextStyle::Framed,
&st::menuIconTextStyleFramed);
&st::mediaMenuIconTextStyleFramed);
add(
tr::lng_photo_editor_text_style_semi_transparent(tr::now),
TextStyle::SemiTransparent,
&st::menuIconTextStyleSemiTransparent);
&st::mediaMenuIconTextStyleSemiTransparent);
_contextMenu->addSeparator();
_contextMenu->addAction(
tr::lng_photo_editor_menu_duplicate(tr::now),
[=] { actionDuplicate(); },
&st::menuIconCopy);
&st::mediaMenuIconCopy);
_contextMenu->addAction(
tr::lng_photo_editor_menu_delete(tr::now),
[=] { actionDelete(); },
&st::menuIconDelete);
&st::mediaMenuIconDelete);
_contextMenu->popup(event->screenPos());
}
Telegram/SourceFiles/media/view/media_view.style
+21
View File
@@ -941,6 +941,27 @@ storiesWhoViewed: WhoRead(defaultWhoRead) {
align: align(left);
}
}
mediaviewEmojiPan: EmojiPan(storiesEmojiPan) {
showAnimation: PanelAnimation(emojiPanAnimation) {
fadeBg: groupCallMenuBg;
}
bg: groupCallMenuBg;
overBg: groupCallMenuBgOver;
pathBg: groupCallMenuBgRipple;
pathFg: groupCallMenuBgOver;
categoriesBg: groupCallMenuBg;
categoriesBgOver: groupCallMenuBgOver;
fadeLeft: icon {{ "fade_horizontal-flip_horizontal", groupCallMenuBg }};
fadeRight: icon {{ "fade_horizontal", groupCallMenuBg }};
tabs: SettingsSlider(emojiTabs) {
barFgActive: storiesComposeBlue;
labelFg: storiesComposeGrayText;
labelFgActive: storiesComposeBlue;
rippleBg: groupCallMenuBgOver;
rippleBgActive: groupCallMenuBgOver;
}
}
storiesReactionsPan: EmojiPan(storiesEmojiPan) {
margin: margins(reactStripSkip, 0px, reactStripSkip, 0px);
padding: margins(reactStripSkip, 0px, reactStripSkip, reactStripSkip);
Telegram/SourceFiles/ui/menu_icons.style
+5 -3
View File
@@ -211,9 +211,6 @@ menuIconDownloadOff: icon {{ "menu/download_off-24x24", menuIconColor }};
menuIconShareOff: icon {{ "menu/share_off-24x24", menuIconColor }};
menuIconShareOn: icon {{ "menu/share_on-24x24", menuIconColor }};
menuIconStar: icon {{ "menu/star", menuIconColor }};
menuIconTextStylePlain: icon {{ "menu/text_style_plain-22x22", menuIconColor, point(0px, 2px) }};
menuIconTextStyleFramed: icon {{ "menu/text_style_framed-22x22", menuIconColor, point(0px, 2px) }};
menuIconTextStyleSemiTransparent: icon {{ "menu/text_style_semi-22x22", menuIconColor, point(0px, 2px) }};
menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
menuIconTTLAnyTextPosition: point(11px, 22px);
@@ -257,6 +254,11 @@ mediaMenuIconRetractVote: icon {{ "menu/retract_vote", mediaviewMenuFg }};
mediaMenuIconInfo: icon {{ "menu/info", mediaviewMenuFg }};
mediaMenuIconBlock: icon {{ "menu/block", mediaviewMenuFg }};
mediaMenuIconFlip: icon {{ "menu/flip", mediaviewMenuFg }};
mediaMenuIconTextStylePlain: icon {{ "menu/text_style_plain-22x22", mediaviewMenuFg, point(0px, 2px) }};
mediaMenuIconTextStyleFramed: icon {{ "menu/text_style_framed-22x22", mediaviewMenuFg, point(0px, 2px) }};
mediaMenuIconTextStyleSemiTransparent: icon {{ "menu/text_style_semi-22x22", mediaviewMenuFg, point(0px, 2px) }};
menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }};
menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }};
menuIconDisableAttention: icon {{ "menu/disable", menuIconAttentionColor }};