Skip to content

Commit 88c3ccd

Browse files
kovacsvkovacsv
committed
Move mouse move min offset from skin parameters to interaction handler.
1 parent e495280 commit 88c3ccd

10 files changed

Lines changed: 30 additions & 27 deletions

File tree

‎Sources/EmbeddingTutorial/main.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ class MyNodeUIEnvironment : public NUIE::NodeUIEnvironment
141141
return clipboardHandler;
142142
}
143143

144+
virtual double GetMouseMoveMinOffset () override
145+
{
146+
return 2.0;
147+
}
148+
144149
private:
145150
NE::BasicStringConverter stringConverter;
146151
NUIE::BasicSkinParams skinParams;

‎Sources/NodeEngineTest/NodeEditorVisualTest.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ const BasicSkinParams& GetSkinParamsWithSlotCircles ()
4545
{ NE::LocalizeString (L"Green"), NUIE::Color (160, 239, 160) },
4646
{ NE::LocalizeString (L"Red"), NUIE::Color (239, 189, 160) }
4747
}),
48-
/*groupPadding*/ 10.0,
49-
/*mouseMoveMinOffset*/ 2.0
48+
/*groupPadding*/ 10.0
5049
);
5150
return slotCirclesSkinParams;
5251
}
@@ -651,8 +650,7 @@ TEST (SkinParamsTest)
651650
{ NE::LocalizeString (L"Green"), NUIE::Color (160, 239, 160) },
652651
{ NE::LocalizeString (L"Red"), NUIE::Color (239, 189, 160) }
653652
}),
654-
/*groupPadding*/ 10.0,
655-
/*mouseMoveMinOffset*/ 2.0
653+
/*groupPadding*/ 10.0
656654
);
657655

658656
SimpleNodeEditorTestEnvWithConnections env (skinParams);

‎Sources/NodeEngineTest/VisualTestFramework.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,11 @@ ClipboardHandler& TestNodeUIEnvironment::GetClipboardHandler ()
288288
return clipboardHandler;
289289
}
290290

291+
double TestNodeUIEnvironment::GetMouseMoveMinOffset ()
292+
{
293+
return 2.0;
294+
}
295+
291296
void TestNodeUIEnvironment::SetNextCommandName (const std::wstring& nextCommandName)
292297
{
293298
eventHandler.SetNextCommandName (nextCommandName);

‎Sources/NodeEngineTest/VisualTestFramework.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class TestNodeUIEnvironment : public NodeUIEnvironment
5454
virtual void OnRedrawRequested () override;
5555
virtual EventHandler& GetEventHandler () override;
5656
virtual ClipboardHandler& GetClipboardHandler () override;
57+
virtual double GetMouseMoveMinOffset () override;
5758

5859
void SetNextCommandName (const std::wstring& nextCommandName);
5960
void SetNextCommandParameterSettings (const ParameterSettingsHandler& handler);

‎Sources/NodeUIEngine/NUIE_InputEventHandler.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,9 @@ void MouseEventTranslator::OnMouseUp (NodeUIEnvironment& env, const ModifierKeys
9494

9595
void MouseEventTranslator::OnMouseMove (NodeUIEnvironment& env, const ModifierKeys& modifierKeys, const Point& position)
9696
{
97-
const SkinParams& skinParams = env.GetSkinParams ();
9897
std::unordered_set<MouseButton> downButtonsMoved;
9998
for (const auto& it : downMouseButtons) {
100-
if (it.second.DistanceTo (position) > skinParams.GetMouseMoveMinOffset ()) {
99+
if (it.second.DistanceTo (position) > env.GetMouseMoveMinOffset ()) {
101100
movingMouseButtons.insert (it.first);
102101
handler.HandleMouseDragStart (env, modifierKeys, it.first, it.second);
103102
downButtonsMoved.insert (it.first);

‎Sources/NodeUIEngine/NUIE_NodeUIEnvironment.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class NodeUIInteractionEnvironment
4747

4848
virtual EventHandler& GetEventHandler () = 0;
4949
virtual ClipboardHandler& GetClipboardHandler () = 0;
50+
virtual double GetMouseMoveMinOffset () = 0;
5051
};
5152

5253
class NodeUIEnvironment : public NodeUIDrawingEnvironment,

‎Sources/NodeUIEngine/NUIE_SkinParams.cpp‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ BasicSkinParams::BasicSkinParams (
5252
const Font& groupNameFont,
5353
const Color& groupNameColor,
5454
const NamedColorSet& groupBackgroundColors,
55-
const double& groupPadding,
56-
const double& mouseMoveMinOffset
55+
const double& groupPadding
5756
) :
5857
backgroundColor (backgroundColor),
5958
connectionLinePen (connectionLinePen),
@@ -82,8 +81,7 @@ BasicSkinParams::BasicSkinParams (
8281
groupNameFont (groupNameFont),
8382
groupNameColor (groupNameColor),
8483
groupBackgroundColors (groupBackgroundColors),
85-
groupPadding (groupPadding),
86-
mouseMoveMinOffset (mouseMoveMinOffset)
84+
groupPadding (groupPadding)
8785
{
8886

8987
}
@@ -233,11 +231,6 @@ double BasicSkinParams::GetGroupPadding () const
233231
return groupPadding;
234232
}
235233

236-
double BasicSkinParams::GetMouseMoveMinOffset () const
237-
{
238-
return mouseMoveMinOffset;
239-
}
240-
241234
const BasicSkinParams& GetDefaultSkinParams ()
242235
{
243236
static const BasicSkinParams defaultSkinParams (
@@ -272,8 +265,7 @@ const BasicSkinParams& GetDefaultSkinParams ()
272265
{ NE::LocalizeString (L"Green"), NUIE::Color (160, 239, 160) },
273266
{ NE::LocalizeString (L"Red"), NUIE::Color (239, 189, 160) }
274267
}),
275-
/*groupPadding*/ 10.0,
276-
/*mouseMoveMinOffset*/ 2.0
268+
/*groupPadding*/ 10.0
277269
);
278270
return defaultSkinParams;
279271
}

‎Sources/NodeUIEngine/NUIE_SkinParams.hpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ class SkinParams
6868
virtual const Color& GetGroupNameColor () const = 0;
6969
virtual const NamedColorSet& GetGroupBackgroundColors () const = 0;
7070
virtual double GetGroupPadding () const = 0;
71-
72-
virtual double GetMouseMoveMinOffset () const = 0;
7371
};
7472

7573
using SkinParamsPtr = std::shared_ptr<SkinParams>;
@@ -107,8 +105,7 @@ class BasicSkinParams : public SkinParams
107105
const Font& groupNameFont,
108106
const Color& groupNameColor,
109107
const NamedColorSet& groupBackgroundColors,
110-
const double& groupPadding,
111-
const double& mouseMoveMinOffset
108+
const double& groupPadding
112109
);
113110
virtual ~BasicSkinParams ();
114111

@@ -147,8 +144,6 @@ class BasicSkinParams : public SkinParams
147144
virtual const NamedColorSet& GetGroupBackgroundColors () const override;
148145
virtual double GetGroupPadding () const override;
149146

150-
virtual double GetMouseMoveMinOffset () const override;
151-
152147
private:
153148
Color backgroundColor;
154149
Pen connectionLinePen;
@@ -186,8 +181,6 @@ class BasicSkinParams : public SkinParams
186181
Color groupNameColor;
187182
NamedColorSet groupBackgroundColors;
188183
double groupPadding;
189-
190-
double mouseMoveMinOffset;
191184
};
192185

193186
const BasicSkinParams& GetDefaultSkinParams ();

‎Sources/WindowsEmbeddingDemo/main.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ static const NUIE::BasicSkinParams& GetDefaultSkinParams ()
5151
{ NE::LocalizeString (L"Green"), NUIE::Color (160, 239, 160) },
5252
{ NE::LocalizeString (L"Red"), NUIE::Color (239, 189, 160) }
5353
}),
54-
/*groupPadding*/ 10.0,
55-
/*mouseMoveMinOffset*/ 2.0
54+
/*groupPadding*/ 10.0
5655
);
5756
return defaultSkinParams;
5857
}
@@ -203,6 +202,11 @@ class MyNodeUIEnvironment : public NUIE::NodeUIEnvironment
203202
return clipboardHandler;
204203
}
205204

205+
virtual double GetMouseMoveMinOffset () override
206+
{
207+
return 2.0;
208+
}
209+
206210
private:
207211
NE::BasicStringConverter stringConverter;
208212
NUIE::BasicSkinParams skinParams;

‎Sources/WindowsEmbeddingDemo2/main.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ class MyNodeUIEnvironment : public NUIE::NodeUIEnvironment
191191
return clipboardHandler;
192192
}
193193

194+
virtual double GetMouseMoveMinOffset () override
195+
{
196+
return 2.0;
197+
}
198+
194199
private:
195200
NE::BasicStringConverter stringConverter;
196201
NUIE::BasicSkinParams skinParams;

0 commit comments

Comments
 (0)