From ea952c4c58a8efb8c1216c18376fcbf17e5798e5 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Thu, 21 Mar 2024 14:28:49 +0100
Subject: [PATCH] actionbar: support both dark and light buttons

since there is no way to do icon masks, we simply use two different
textures for dark and light mode reply buttons.

I used this command to create the dark mode button:

convert reply.png -channel RGB -negate reply-dark.png

Signed-off-by: William Casarin <jb55@jb55.com>
---
 assets/icons/reply-dark.png | Bin 0 -> 912 bytes
 src/app.rs                  |  35 ++++++++++++++---------------------
 2 files changed, 14 insertions(+), 21 deletions(-)
 create mode 100644 assets/icons/reply-dark.png

diff --git a/assets/icons/reply-dark.png b/assets/icons/reply-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..fabe1b05c3382eadb98561cc8b568af74e9c849d
GIT binary patch
literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq002M$002b@1ONa4P^~ED0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmYLwx`MLwy0jcT;@;00QGlL_t(&-tC!BNK`=_$3N=srmF@CDoJESS(FF`b<#W(
z{W%r}MPSgSZc-gObPnrW5YnZKQXV5~sW4Ew1{GRj7FtnJiKXVUYrYP%ul&88_a5up
z***Avb6DoLGxPn-ym{}<eiw=yC7N6{huKLJwLk^sKsgmF7<+*vkYoY)#u%d{nDy(_
zLND`JhRQs>w782$xJKHTxLs0o6Vb_6@xZvaT?VLf%9j;T-ooNOWfGvfpz;<LSC-4~
zAXRXHwAzkpJ6t9z)?=0)hIva8NHZ7UHm@QIl(U64&QdM5{3TA=jphW~2pa=Px<@0U
zLTAq2ipNEI#*n;1_$jnHpcH5pjczby3}BM$qTZ|knnZHYm^{E!QQN8jYDMzBQ2;r5
zodSr7<h)UU-=Y>(0P+@GGzyRwwU}-N(m4zl6hONIg#?Hd8z8d+^6mV`D1h8y8Gxcj
z2oM5<03kpK5CVh%s}4Z^C|@i*K-TfE6tG0HB!}Vh1h7;zfRqA|$I!AIhRYLxJgKfR
z3Lr<%T!Jqm*<chvdJi)SU_vDK8wJ=aYUAqTyl^evWqWvei)to?)@haAmgV8C#2NOF
zxWkJ~Q*VFu%z-e%u{>|a4V-jXR2C1xzUvQ>$m(M8nIy2pB)7P$9X3Kc2iVSf;#6u|
zR1(9@Z9mB4|CKvFwqjRS_b3;c3Sd<B$>C~v?b-a7V-CA{8OSGn#aic#HZktmWx1Jm
zhJ`@#Z)ntAuR0!iblR0^72{?=mpDO<+g>f9lL=3NdWHjukJ<jPdqg-w4?}#?0PNvI
z&XP%{nP!Z8Ty;DLeWTw2(5b!hLv+x{I!%e^Cg%q*pb<~eW%B&c@3XjHX%8+ES#i(j
z9L<NX?sX{jGHrWlHE8Q+;<n4uFLEJ&B3_r^qc;146Ff0JcNMLg*}q_OVZ>E9|IF-j
zdFdL9IDP-bzjMxng#Tk?A8j-+NW$=cDPgSI_zQq3LTGv7dwu`_02y>eSaefwW^{L9
ma%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*0000<MNUMnLSTYwu#JTP

literal 0
HcmV?d00001

diff --git a/src/app.rs b/src/app.rs
index cd4d6a6..41ecb95 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -681,23 +681,9 @@ fn render_note(
                     render_reltime(ui, note_cache);
                 });
 
-                let note_sidebar_size = 20.0;
+                ui.add(NoteContents::new(damus, &txn, &note, note_key));
 
-                ui.horizontal(|ui| {
-                    let mut size = ui.available_size();
-                    size.x -= note_sidebar_size;
-
-                    let contents = NoteContents::new(damus, &txn, &note, note_key);
-                    //let resp = render_note_contents(ui, damus, &txn, &note, note_key);
-                    //ui.allocate_space()
-                    //
-                    ui.add_sized(size, contents);
-
-                    collapse_state.show_body_unindented(ui, |ui| {
-                        ui.set_width(note_sidebar_size);
-                        render_note_actionbar(ui)
-                    });
-                });
+                render_note_actionbar(ui);
 
                 //let header_res = ui.horizontal(|ui| {});
             });
@@ -716,13 +702,20 @@ fn render_note(
 }
 
 fn render_note_actionbar(ui: &mut egui::Ui) -> egui::InnerResponse<()> {
-    ui.vertical(|ui| {
+    ui.horizontal(|ui| {
+        let img_data = if ui.style().visuals.dark_mode {
+            egui::include_image!("../assets/icons/reply.png")
+        } else {
+            egui::include_image!("../assets/icons/reply-dark.png")
+        };
+
+        ui.spacing_mut().button_padding = egui::vec2(0.0, 0.0);
         if ui
             .add(
-                egui::Button::image(egui::Image::new(egui::include_image!(
-                    "../assets/icons/reply.png"
-                )))
-                .fill(ui.style().visuals.panel_fill),
+                egui::Button::image(egui::Image::new(img_data).max_width(10.0))
+                    //.stroke(egui::Stroke::NONE)
+                    .frame(false)
+                    .fill(ui.style().visuals.panel_fill),
             )
             .clicked()
         {}