From d9b4b42f74492a64ab3e8c59b6f7073a132910a0 Mon Sep 17 00:00:00 2001 From: zhenyan121 <3367366583@qq.com> Date: Fri, 7 Aug 2026 20:22:50 +0800 Subject: [PATCH] feat(screenshot-ui): add newest/oldest sort selector Add a combo button to the screenshot gallery to sort files by modification time (newest or oldest first). Store timestamp per image and rebuild layout when sort order changes. Include translations for en_US and zh_CN. --- assets/lang/en_US.json | 5 ++- assets/lang/zh_CN.json | 5 ++- include/Cubed/ui/screenshot_ui.hpp | 8 ++++ src/ui/screenshot_ui.cpp | 67 ++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 2 deletions(-) diff --git a/assets/lang/en_US.json b/assets/lang/en_US.json index 0b2d4e4..b0e9e0c 100644 --- a/assets/lang/en_US.json +++ b/assets/lang/en_US.json @@ -49,5 +49,8 @@ "item.water.name": "water", "item.pig_spawn_egg.name": "pig spawn egg", "screenshot.no_screenshot": "No Screenshot", - "button.show_in_file_manager": "Show In File Manager" + "button.show_in_file_manager": "Show In File Manager", + "file.sort_type": "File Sort Type: {type}", + "file.newest_first": "Newest First", + "file.oldest_first": "Oldest First" } \ No newline at end of file diff --git a/assets/lang/zh_CN.json b/assets/lang/zh_CN.json index 0b0185e..0b13bda 100644 --- a/assets/lang/zh_CN.json +++ b/assets/lang/zh_CN.json @@ -49,5 +49,8 @@ "item.water.name": "水", "item.pig_spawn_egg.name": "猪猪刷怪蛋", "screenshot.no_screenshot": "没有截图", - "button.show_in_file_manager": "在文件管理器中显示" + "button.show_in_file_manager": "在文件管理器中显示", + "file.sort_type": "文件排序方式：{type}", + "file.newest_first": "最新在前", + "file.oldest_first": "最旧在前" } \ No newline at end of file diff --git a/include/Cubed/ui/screenshot_ui.hpp b/include/Cubed/ui/screenshot_ui.hpp index edf0625..28603ae 100644 --- a/include/Cubed/ui/screenshot_ui.hpp +++ b/include/Cubed/ui/screenshot_ui.hpp @@ -2,6 +2,8 @@ #include "Cubed/ui/image.hpp" #include "Cubed/ui/ui_manager.hpp" + +#include namespace Cubed { class Texture; class ScreenshotScene; @@ -20,16 +22,22 @@ public: void update_layout(int width, int height); void open_lightbox(const Texture* image); + void update(float dt) override; private: struct ImageInfo { const Texture* texture = nullptr; int width = 0; int height = 0; + std::chrono::nanoseconds time{0}; }; + enum class SortType { NEWEST_FIRST, OLDEST_FIRST }; + ScreenshotScene& m_scene; std::vector m_image_infos; + SortType m_sort_type = SortType::NEWEST_FIRST; + bool m_need_rebuild = false; Widget* m_lightbox = nullptr; Image* m_lightbox_image = nullptr; bool handle_window_resize_event(const WindowResizeEvent& e) override; diff --git a/src/ui/screenshot_ui.cpp b/src/ui/screenshot_ui.cpp index 1779c5b..6fe3013 100644 --- a/src/ui/screenshot_ui.cpp +++ b/src/ui/screenshot_ui.cpp @@ -7,12 +7,14 @@ #include "Cubed/tools/file_utils.hpp" #include "Cubed/ui/button.hpp" #include "Cubed/ui/column_layout.hpp" +#include "Cubed/ui/combo_button.hpp" #include "Cubed/ui/row_layout.hpp" #include "Cubed/ui/scroll_view.hpp" #include #include #include + namespace fs = std::filesystem; namespace { constexpr std::array IMAGE_EXT{".jpg", ".jpeg", ".png", @@ -61,6 +63,17 @@ void ScreenshotUI::update_layout(int width, int height) { info.texture->set_linear(); info.height = info.texture->height() * IMAGE_SCALE; info.width = info.texture->width() * IMAGE_SCALE; + std::error_code ec; + auto ftime = fs::last_write_time(entry, ec); + if (!ec) { + auto sys_time = + std::chrono::clock_cast(ftime); + info.time = + std::chrono::time_point_cast( + sys_time) + .time_since_epoch(); + } + m_image_infos.emplace_back(std::move(info)); } constexpr int PADDING = 50; @@ -88,6 +101,18 @@ void ScreenshotUI::update_layout(int width, int height) { row->set_spacing(SPACING); }; + std::sort(m_image_infos.begin(), m_image_infos.end(), + [this](const ImageInfo& a, const ImageInfo& b) { + switch (m_sort_type) { + case SortType::NEWEST_FIRST: + return a.time > b.time; + case SortType::OLDEST_FIRST: + return a.time < b.time; + default: + return a.time > b.time; + } + }); + for (auto& image : m_image_infos) { if (!row) { create_row(); @@ -111,14 +136,47 @@ void ScreenshotUI::update_layout(int width, int height) { .set_color(Color::WHITE) .set_anchor(Anchor::CENTER); } + + { + auto& combo = bg->add_child(); + combo.set_anchor(Anchor::TOP_RIGHT); + combo.set_offset(title.get_offset()); + + switch (m_sort_type) { + case SortType::NEWEST_FIRST: + combo.set_index(0); + break; + case SortType::OLDEST_FIRST: + combo.set_index(1); + break; + default: + combo.set_index(0); + } + combo.set_combo_text("file.sort_type", "type"); + std::vector combos; + + combos.emplace_back(tr("file.newest_first"), [this]() { + m_sort_type = SortType::NEWEST_FIRST; + m_need_rebuild = true; + }); + combos.emplace_back(tr("file.oldest_first"), [this]() { + m_sort_type = SortType::OLDEST_FIRST; + m_need_rebuild = true; + }); + combo.set_default_image(texture_manager); + combo.set_combos(combos); + } + auto& bottom_row = bg->add_child(); bottom_row.set_spacing(10); bottom_row.set_anchor(Anchor::BOTTOM_CENTER).set_offset({0, -30}); + auto& open_file = bottom_row.add_child