diff options
Diffstat (limited to 'fluid/nodes/factory.cxx')
| -rw-r--r-- | fluid/nodes/factory.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/fluid/nodes/factory.cxx b/fluid/nodes/factory.cxx index 792a9ff72..70e960edd 100644 --- a/fluid/nodes/factory.cxx +++ b/fluid/nodes/factory.cxx @@ -390,7 +390,7 @@ private: } public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() + 8; w = layout->textsize_not_null() * 4 + 4 * h; // make room for the arrows fld::app::Snap_Action::better_size(w, h); @@ -420,7 +420,7 @@ public: static Adjuster_Node prototype; public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->labelsize + 8; w = 3 * h; fld::app::Snap_Action::better_size(w, h); @@ -495,7 +495,7 @@ private: Fl_Menu_Item *subtypes() override { return roller_type_menu; } public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; w = layout->labelsize + 8; h = 4 * w; fld::app::Snap_Action::better_size(w, h); @@ -539,7 +539,7 @@ private: Fl_Menu_Item *subtypes() override { return slider_type_menu; } public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; w = layout->labelsize + 8; h = 4 * w; fld::app::Snap_Action::better_size(w, h); @@ -649,7 +649,7 @@ private: } public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() + 8; w = layout->textsize_not_null() * 4 + 8; fld::app::Snap_Action::better_size(w, h); @@ -692,7 +692,7 @@ private: } public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() + 8; w = layout->textsize_not_null() * 4 + 8; fld::app::Snap_Action::better_size(w, h); @@ -751,7 +751,7 @@ private: } public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() + 8; w = layout->textsize_not_null() * 6 + 8; fld::app::Snap_Action::better_size(w, h); @@ -793,7 +793,7 @@ private: Fl_Menu_Item *subtypes() override { return 0; } // Don't inherit. public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() + 8 + 10; // Directoy bar is additional 10 pixels high w = layout->textsize_not_null() * 10 + 8; fld::app::Snap_Action::better_size(w, h); @@ -877,7 +877,7 @@ private: } public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() * 4 + 8; w = layout->textsize_not_null() * 10 + 8; fld::app::Snap_Action::better_size(w, h); @@ -1101,7 +1101,7 @@ public: static Progress_Node prototype; public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->labelsize + 8; w = layout->labelsize * 12; fld::app::Snap_Action::better_size(w, h); @@ -1153,7 +1153,7 @@ private: } public: void ideal_size(int &w, int &h) override { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; h = layout->textsize_not_null() + 8; w = layout->textsize_not_null() * 4 + 8; fld::app::Snap_Action::better_size(w, h); @@ -1282,11 +1282,11 @@ static Node *known_types[] = { Node *add_new_widget_from_user(Node *inPrototype, Strategy strategy, bool and_open) { Fluid.proj.undo.checkpoint(); Fluid.proj.undo.suspend(); - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; Node *t = ((Node*)inPrototype)->make(strategy); if (t) { if (t->is_widget() && !t->is_a(FLD_NODE_TYPE_Window)) { - auto layout = Fluid.proj.layout; + fld::app::Layout_Preset *layout = Fluid.proj.layout; Widget_Node *wt = (Widget_Node *)t; bool changed = false; |