diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-20 18:02:12 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-08-02 21:26:28 +0000 |
| commit | da8a282a10064114876798b430d83f3eedc5c9ab (patch) | |
| tree | 9d1421920b155c09e2534d8143789c7e97f8acbf /src/ui/toolbar/text-toolbar.h | |
| parent | Add subselections improvements (diff) | |
| download | inkscape-da8a282a10064114876798b430d83f3eedc5c9ab.tar.gz inkscape-da8a282a10064114876798b430d83f3eedc5c9ab.zip | |
Add proposal 2 of line height
Diffstat (limited to 'src/ui/toolbar/text-toolbar.h')
| -rw-r--r-- | src/ui/toolbar/text-toolbar.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/ui/toolbar/text-toolbar.h b/src/ui/toolbar/text-toolbar.h index ea480ad1b..da9835f42 100644 --- a/src/ui/toolbar/text-toolbar.h +++ b/src/ui/toolbar/text-toolbar.h @@ -68,17 +68,17 @@ private: UI::Widget::ComboBoxEntryToolItem *_font_family_item; UI::Widget::ComboBoxEntryToolItem *_font_size_item; UI::Widget::ComboBoxEntryToolItem *_font_style_item; - Gtk::Popover *_line_spacing_menu; - Gtk::Box *_line_spacing_menu_content; - Gtk::ToolButton *_line_spacing_defaulting; - Gtk::ToggleToolButton *_line_height_unset_item; +/* Gtk::Popover *_line_spacing_menu; */ +/* Gtk::Box *_line_spacing_menu_content; */ +/* Gtk::ToolButton *_line_spacing_defaulting; */ +/* Gtk::ToggleToolButton *_line_height_unset_item; */ Gtk::ToggleToolButton *_line_spacing_menu_launcher; UI::Widget::ComboToolItem *_line_height_units_item; UI::Widget::SpinButtonToolItem *_line_height_item; - UI::Widget::ComboToolItem *_line_spacing_item; +/* UI::Widget::ComboToolItem *_line_spacing_item; */ Gtk::ToggleToolButton *_superscript_item; Gtk::ToggleToolButton *_subscript_item; - Gtk::ToggleToolButton *_outer_style_item; +/* Gtk::ToggleToolButton *_outer_style_item; */ UI::Widget::ComboToolItem *_align_item; @@ -98,7 +98,8 @@ private: Glib::RefPtr<Gtk::Adjustment> _dx_adj; Glib::RefPtr<Gtk::Adjustment> _dy_adj; Glib::RefPtr<Gtk::Adjustment> _rotation_adj; - std::vector<SPObject *> subselection_objs; + std::vector<SPObject *> sub_selection_objs; + std::vector<SPObject *> sub_unselection_objs; int _lineheight_unit; sigc::connection c_selection_changed; @@ -109,17 +110,17 @@ private: void fontsize_value_changed(); void fontstyle_value_changed(); void script_changed(Gtk::ToggleToolButton *btn); - void lineheight_unset_changed(); - void outer_style_changed(); +/* void lineheight_unset_changed(); */ +/* void outer_style_changed(); */ void align_mode_changed(int mode); void writing_mode_changed(int mode); void orientation_changed(int mode); void direction_changed(int mode); void lineheight_value_changed(); void lineheight_unit_changed(int not_used); - void lineheight_defaulting(); - void line_height_popover_closed(); - void line_spacing_mode_changed(int mode); +/* void lineheight_defaulting(); */ +/* void line_height_popover_closed(); + void line_spacing_mode_changed(int mode); */ void wordspacing_value_changed(); void letterspacing_value_changed(); void dx_value_changed(); @@ -132,7 +133,7 @@ private: void subselection_changed(gpointer tc); void watch_ec(SPDesktop* desktop, Inkscape::UI::Tools::ToolBase* ec); void set_sizes(int unit); - void poptoggle(Gtk::ToggleToolButton *btn); +/* void poptoggle(Gtk::ToggleToolButton *btn); */ protected: TextToolbar(SPDesktop *desktop); |