diff options
| -rw-r--r-- | .github/workflows/ci.yml | 11 | ||||
| -rw-r--r-- | ci/used-icons.txt | 1 | ||||
| -rw-r--r-- | src/components/chatinput.cpp | 9 |
3 files changed, 20 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5ec12e..bea5a2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,6 +73,17 @@ jobs: cp -r res/css res/res res/fonts build/artifactdir/bin cp /mingw64/share/glib-2.0/schemas/gschemas.compiled build/artifactdir/share/glib-2.0/schemas cat "ci/msys-deps.txt" | sed 's/\r$//' | xargs -I % cp /mingw64% build/artifactdir/bin || : + mkdir -p build/artifactdir/share/icons/Adwaita + cd build/artifactdir/share/icons/Adwaita + mkdir -p 16x16/actions 24x24/actions 32x32/actions 48x48/actions 64x64/actions 96x96/actions scalable/actions + cd ../../../../../ + cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/16x16/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/16x16/actions || : + cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/24x24/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/24x24/actions || : + cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/32x32/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/32x32/actions || : + cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/48x48/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/48x48/actions || : + cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/64x64/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/64x64/actions || : + cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/96x96/actions/%.symbolic.png build/artifactdir/share/icons/Adwaita/96x96/actions || : + cat "ci/used-icons.txt" | sed 's/\r$//' | xargs -I % cp ci/gtk-for-windows/gtk-nsis-pack/share/icons/Adwaita/scalable/actions/%.svg build/artifactdir/share/icons/Adwaita/scalable/actions || : - name: Upload build (1) uses: haya14busa/action-cond@v1 diff --git a/ci/used-icons.txt b/ci/used-icons.txt new file mode 100644 index 0000000..212a8d5 --- /dev/null +++ b/ci/used-icons.txt @@ -0,0 +1 @@ +document-send-symbolic diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index a734dec..cd508e8 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -188,15 +188,20 @@ ChatInputAttachmentContainer::type_signal_emptied ChatInputAttachmentContainer:: ChatInputAttachmentItem::ChatInputAttachmentItem(const Glib::RefPtr<Gio::File> &file) : m_file(file) - , m_img(Gtk::make_managed<Gtk::Image>(Abaddon::Get().GetImageManager().GetPlaceholder(AttachmentItemSize))) + , m_img(Gtk::make_managed<Gtk::Image>()) , m_type(ChatSubmitParams::ExtantFile) { get_style_context()->add_class("attachment-item"); set_size_request(AttachmentItemSize, AttachmentItemSize); + m_box.set_halign(Gtk::ALIGN_CENTER); + m_box.set_valign(Gtk::ALIGN_CENTER); m_box.add(*m_img); add(m_box); show_all_children(); + m_img->property_icon_name() = "document-send-symbolic"; + m_img->property_icon_size() = Gtk::ICON_SIZE_DIALOG; // todo figure out how to not use this weird property??? i dont know how icons work (screw your theme) + SetupMenu(); auto info = m_file->query_info(G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME); @@ -215,6 +220,8 @@ ChatInputAttachmentItem::ChatInputAttachmentItem(const Glib::RefPtr<Gio::File> & m_img->property_pixbuf() = pb->scale_simple(outw, outh, Gdk::INTERP_BILINEAR); set_size_request(AttachmentItemSize, AttachmentItemSize); + m_box.set_halign(Gtk::ALIGN_CENTER); + m_box.set_valign(Gtk::ALIGN_CENTER); m_box.add(*m_img); add(m_box); show_all_children(); |