From 269933cae0de771083cc3db332a57275d2046baf Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Mon, 18 Nov 2024 22:10:37 -0500 Subject: [PATCH] feat: ui: show a block around edit section --- examples/test.xlsx | Bin 3891 -> 3898 bytes src/ui/mod.rs | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/examples/test.xlsx b/examples/test.xlsx index 714870df7d7ad48210feaa90542dcefbaeaa7275..a2b60d1cb1c09534a33d6358408b85cb356ed988 100644 GIT binary patch delta 1251 zcmdliw@Z#Uz?+#xgn@y9gTYF?cq4BnBeRuw@#IQI6)?Sk@vV@RcyVNvu3&X5BLjm0 zGXsMl!{m)T!u7qAeEkm_@U*@E)1~!YFZX!*7Ew+CAt4Ws9Hv6<&h4#RJ*QN>{`KDT z_S)MC?0Fmi{_6aEZ1HX1NSEw_I7wTzmkNr48Hr0SeKwrwC-*p8sPakFr$ZSMlcj8S zo;~k&$S6@}k5%%)g-r6S6TbP}FpN})a$70Rt+7*{rIqjK%tF=r;{v-Zx5nuFl*yQ; zGJOlnlS#_Uc@4JNPRyAY^u=R$kt_FvCMQPKj4vj#OG?(e7A&>Dc_EB%%F;u(4tc&@ zcVo4A+}A^^R&&4coQRi{a$ri6T6rViWpb{FCsj`}&oaX?KZy z%jSXu7kB(QDOr1-ThP~bN7&Z-)h5gI7q07>Z1+Xp)luyr_i~-K`EOphcP`M|aeVrR zt;VdM*8Qu!81H!bal+afcbl$lZsnUBdzu{AY%UJ3l)q>1Bj-6!^=9RqWrbC?C);%P zCOtoVK5ft9f3_R$-1{&8=&Z`g8%ITVpWy4TcCg;Z@nL6Ssrf&Ows zR;5wtjwe6)VG+mxionSZEQ+9r+nmC}4~fY#RymNsBf?w0EHh92kJ=K1h`@^V!!LFUQt-|ek_=e+FndAG%UbHc9~%sFq=bHF27t2m+J z`>&GU4HNkfO>v55=BaNy?p^2Ve@(WQS0I2z;(URu({6<$r=_GGrf*{vo_cDRTg!`G z%pcb>2Yz#{?^XM(vs=A4fNee}_jmcWwOXo)$xq#x)#fPjZQ&@aiC=v!+0R>a>lXf^ z0K+|}#9uQB`~5zb&*fK_vUtmhd$*E{=6Sb0W^B5V@7T;E@YhDD_Py$&4uAIS3s#Mf zGwt5ZsC&TG6(n!2Y&-c{M!;7xVmqP738dARWZ z`FUWz|IhuOx)j&H_}ukUMlX^duJV2CeD%_-K`1Ca_#lZ)o=4h(jT3A%!~tj)L>Ajk zVZ6z}z+lS6z#xTUr0(Q8K25NZtN5gC?YO{(l;;;^7iXlVmK38qH4>gUnHU%(P)y32 M%*3zFb`2aR0H#L9Pyhe` delta 1220 zcmdlbw^@!iz?+#xgn@y9gCS{8(MH}(M&_hFMUyKTRlxKD#|`zePjesp{UHuBCBl#soFqOrZt7yHh(Gd(1k8oL}ybzva}}dpK|7-(Q`d zk2PQ1ccNJ~LVc^$q#fcD8APr-t-3lv=h@^B6Iu9X3h7+uYFonO?soHR!|W;9-1%YB z8#E5G$}NdGb#}rUL0_+xkFzyqysm8hbad%9R%iKJ^`fRd`8T*S?7QA&GM->@cFRu4 zuu`&AV0}L!E&DT@f<>zgSHO#mJKZlmyA!y}w=P^cN0YmAYUAol$s2>;&wbO98u{(i zl8L{5CjT<5oonjPyL8psM-H136e_xeiche8Dfyzl{qHZfzT92he`ZD}tjPVAv{h>J z9CmK@ZGp1dTVK{oukgxk{rp#a;&je}J6_HI)T4j79$H=etl-uDGEGOD(Ea+qv{zK? zyjhanDSq+bi!w8TMstnaw>Dw-CV%`~iuD`)4jTxxmCsZ9#KK&9iK9j9cBpsjkpm&8-dRmQwknzZ_L2|Z z=3Ex?QdhhG^WX2f`zLe$-JG?CU4F~vIU40)nB`iIq&}E zuq^MsmYM(g4`1CHwxQ_NVpi#X0e&~Pn!1b<@s5P4$D(Gbe-0?#q>*-dQoupB=jOca z1!C!$6V?|0o?;U|=K<5AJL?WMbTw2q9x+Ji)cE+~p|?C5>H^r|>F+9k7d6+Qx?sti8CTGAFfIuOc@G%^i_~W(wwS z85kIv7#SG&VWu!JFf3_&FXDPZn$#JT)>gFi0R7wxls_GAF+_+j(w~AOIr5-?jh% diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 5f01b6c..4c5755c 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -263,6 +263,7 @@ fn reset_text_area<'a>(content: String) -> TextArea<'a> { let mut text_area = TextArea::from(content.lines()); text_area.set_cursor_line_style(Style::default()); text_area.set_cursor_style(Style::default()); + text_area.set_block(Block::bordered()); text_area } @@ -290,7 +291,7 @@ impl<'widget, 'ws: 'widget> Widget for &'widget mut Workspace<'ws> { .right_aligned(), ); let [edit_rect, table_rect, info_rect] = Layout::vertical(&[ - Constraint::Fill(1), + Constraint::Fill(4), Constraint::Fill(30), Constraint::Fill(9), ]) @@ -299,7 +300,11 @@ impl<'widget, 'ws: 'widget> Widget for &'widget mut Workspace<'ws> { .flex(Flex::Legacy) .areas(area.clone()); outer_block.render(area, buf); + + // Input widget display self.text_area.render(edit_rect, buf); + + // Table widget display let table_block = Block::bordered(); let table_inner: Table = TryFrom::try_from(&self.book).expect(""); let table = table_inner.block(table_block); @@ -310,7 +315,8 @@ impl<'widget, 'ws: 'widget> Widget for &'widget mut Workspace<'ws> { self.state.table_state.select_column(Some(col)); use ratatui::widgets::StatefulWidget; StatefulWidget::render(table, table_rect, buf, &mut self.state.table_state); - //table.render_stateful(table_rect, buf); + + // Help panel widget display let info_para = self.render_help_text(); info_para.render(info_rect, buf); }