Skip to content

feat: expand brush style menu, fix inconsistencies #1745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kneemund wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: expand brush style menu, fix inconsistencies #1745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 35 additions & 91 deletions crates/rnote-ui/data/ui/penssidebar/brushpage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,44 @@
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkMenuButton" id="brushstyle_menubutton">
<property name="direction">left</property>
<property name="tooltip_text" translatable="yes">Brush Style</property>
<property name="popover">brushstyle_popover</property>
<property name="icon-name">pen-brush-style-solid-symbolic</property>
<object class="GtkBox" id="brushstyle_togglebox">
<property name="orientation">vertical</property>
<property name="homogeneous">true</property>
<property name="vexpand">false</property>
<style>
<class name="flat" />
<class name="sidebar_action_button" />
<class name="linked" />
</style>
<child>
<object class="GtkToggleButton" id="brushstyle_marker_toggle">
<property name="tooltip_text" translatable="yes">Marker</property>
<property name="icon-name">pen-brush-style-marker-symbolic</property>
<style>
<class name="sidebar_action_button" />
</style>
</object>
</child>
<child>
<object class="GtkToggleButton" id="brushstyle_solid_toggle">
<property name="group">brushstyle_marker_toggle</property>
<property name="tooltip_text" translatable="yes">Solid</property>
<property name="icon-name">pen-brush-style-solid-symbolic</property>
<style>
<class name="sidebar_action_button" />
</style>
</object>
</child>
<child>
<object class="GtkToggleButton" id="brushstyle_textured_toggle">
<property name="group">brushstyle_marker_toggle</property>
<property name="tooltip_text" translatable="yes">Textured</property>
<property name="icon-name">pen-brush-style-textured-symbolic</property>
<style>
<class name="sidebar_action_button" />
</style>
</object>
</child>
</object>
</child>
<child>
Expand All @@ -48,90 +76,6 @@
<object class="RnStrokeWidthPicker" id="stroke_width_picker">
</object>
</child>

<!-- Brush style -->
<object class="GtkPopover" id="brushstyle_popover">
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox">
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Brush Styles</property>
<property name="hexpand">true</property>
<property name="halign">center</property>
<style>
<class name="title-3" />
</style>
</object>
</child>
<child>
<object class="GtkButton" id="brushstyle_popover_close_button">
<property name="icon-name">window-close-symbolic</property>
<style>
<class name="flat" />
<class name="circular" />
</style>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBox" id="brushstyle_listbox">
<property name="width-request">300</property>
<property name="selection-mode">browse</property>
<style>
<class name="content" />
<class name="large" />
</style>
<child>
<object class="AdwActionRow" id="brushstyle_marker_row">
<property name="title" translatable="yes">Marker</property>
<property name="subtitle" translatable="yes">Mark underneath other strokes</property>
<child type="prefix">
<object class="GtkImage">
<property name="icon-name">pen-brush-style-marker-symbolic</property>
<property name="icon-size">large</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwActionRow" id="brushstyle_solid_row">
<property name="title" translatable="yes">Solid</property>
<property name="subtitle" translatable="yes">Draw solid color strokes</property>
<child type="prefix">
<object class="GtkImage">
<property name="icon-name">pen-brush-style-solid-symbolic</property>
<property name="icon-size">large</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwActionRow" id="brushstyle_textured_row">
<property name="title" translatable="yes">Textured</property>
<property name="subtitle" translatable="yes">Draw textured strokes</property>
<child type="prefix">
<object class="GtkImage">
<property name="icon-name">pen-brush-style-textured-symbolic</property>
<property name="icon-size">large</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</object>

<!-- Brush config -->
<object class="GtkPopover" id="brushconfig_popover">
<child>
Expand Down
6 changes: 1 addition & 5 deletions crates/rnote-ui/data/ui/penssidebar/shaperpage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<property name="vexpand">false</property>
<child>
<object class="GtkMenuButton" id="shapebuildertype_menubutton">
Expand Down Expand Up @@ -56,11 +57,6 @@
<object class="RnStrokeWidthPicker" id="stroke_width_picker">
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="orientation">vertical</property>
</object>
</child>

<!-- Shape config -->
<object class="GtkPopover" id="shapeconfig_popover">
Expand Down
1 change: 1 addition & 0 deletions crates/rnote-ui/data/ui/penssidebar/toolspage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkToggleButton" id="toolstyle_verticalspace_toggle">
<property name="tooltip_text" translatable="yes">Insert Vertical Space</property>
Expand Down
10 changes: 0 additions & 10 deletions crates/rnote-ui/src/appwindow/imp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,11 +693,6 @@ impl RnAppWindow {
.brush_page()
.brushconfig_menubutton()
.set_direction(ArrowType::Right);
obj.overlays()
.penssidebar()
.brush_page()
.brushstyle_menubutton()
.set_direction(ArrowType::Right);
obj.overlays()
.penssidebar()
.brush_page()
Expand Down Expand Up @@ -810,11 +805,6 @@ impl RnAppWindow {
.brush_page()
.brushconfig_menubutton()
.set_direction(ArrowType::Left);
obj.overlays()
.penssidebar()
.brush_page()
.brushstyle_menubutton()
.set_direction(ArrowType::Left);
obj.overlays()
.penssidebar()
.brush_page()
Expand Down
Loading
Loading