Merge branch 'develop' into uiscripting

vstgui/contrib/datepicker.mm

@@ -141,6 +141,9 @@ static void validate (id self, SEL cmd, NSDatePickerCell* datePickerCell,
 	dateComponents.month = date.month;
 	dateComponents.year = date.year;
 	impl->view.dateValue = [calendar dateFromComponents:dateComponents];
+#if !__has_feature(objc_arc)
+	[dateComponents release];
+#endif
 }
 
 //------------------------------------------------------------------------

vstgui/lib/controls/cknob.cpp

@@ -13,9 +13,9 @@
 
 namespace VSTGUI {
 #if TARGET_OS_IPHONE
-static const float kCKnobRange = 300.f;
+static const float kCKnobRangeDefault = 300.f;
 #else
-static const float kCKnobRange = 200.f;
+static const float kCKnobRangeDefault = 200.f;
 #endif
 
 static constexpr CViewAttributeID kCKnobMouseStateAttribute = 'knms';
@@ -40,6 +40,7 @@ CKnobBase::CKnobBase (const CRect& size, IControlListener* listener, int32_t tag
 	setStartAngle ((float)(3.f * Constants::quarter_pi));
 	setRangeAngle ((float)(3.f * Constants::half_pi));
 	zoomFactor = 1.5f;
+	knobRange = kCKnobRangeDefault;
 }
 
 //------------------------------------------------------------------------
@@ -112,7 +113,7 @@ CMouseEventResult CKnobBase::onMouseDown (CPoint& where, const CButtonState& but
 
 	mouseState.modeLinear = false;
 	mouseState.entryState = value;
-	mouseState.range = kCKnobRange;
+	mouseState.range = knobRange;
 	mouseState.coef = (getMax () - getMin ()) / mouseState.range;
 	mouseState.oldButton = buttons;
 
@@ -193,7 +194,7 @@ CMouseEventResult CKnobBase::onMouseMoved (CPoint& where, const CButtonState& bu
 				CCoord diff = (mouseState.firstPoint.y - where.y) + (where.x - mouseState.firstPoint.x);
 				if (buttons != mouseState.oldButton)
 				{
-					mouseState.range = kCKnobRange;
+					mouseState.range = knobRange;
 					if (buttons & kZoomModifier)
 						mouseState.range *= zoomFactor;
 

vstgui/lib/controls/cknob.h

@@ -33,6 +33,9 @@ class CKnobBase : public CControl, protected CMouseWheelEditingSupport
 
 	virtual CCoord getInsetValue () const { return inset; }
 	virtual void setInsetValue (CCoord val) { inset = val; }
+
+	virtual void setKnobRange (float val) { if (val > 0.f) knobRange = val; }
+	virtual float getKnobRange () const { return knobRange; }
 	//@}
 
 	// overrides
@@ -56,6 +59,7 @@ class CKnobBase : public CControl, protected CMouseWheelEditingSupport
 
 	float startAngle, rangeAngle;
 	float zoomFactor;
+	float knobRange;
 	CCoord inset;
 
 private:

vstgui/lib/platform/linux/cairogradient.cpp

@@ -44,22 +44,24 @@ const PatternHandle& Gradient::getLinearGradient (CPoint start, CPoint end) cons
 }
 
 //------------------------------------------------------------------------
-const PatternHandle& Gradient::getRadialGradient ()
+const PatternHandle& Gradient::getRadialGradient (CPoint center, CCoord radius,
+												  CPoint originOffset) const
 {
 	if (!radialGradient)
 	{
-		radialGradient = PatternHandle (cairo_pattern_create_radial (0, 0, 1, 0, 0, 1));
+		radialGradient = PatternHandle (
+			cairo_pattern_create_radial (center.x, center.y, 0., center.x, center.y, radius));
+
 		for (auto& it : getColorStops ())
 		{
 			cairo_pattern_add_color_stop_rgba (
-			    radialGradient, it.first, it.second.normRed<double> (),
-			    it.second.normGreen<double> (), it.second.normBlue<double> (),
-			    it.second.normAlpha<double> ());
+				radialGradient, it.first, it.second.normRed<double> (),
+				it.second.normGreen<double> (), it.second.normBlue<double> (),
+				it.second.normAlpha<double> ());
 		}
 	}
 	return radialGradient;
 }
-
 //------------------------------------------------------------------------
 } // Cairo
 } // VSTGUI

vstgui/lib/platform/linux/cairogradient.h

@@ -20,7 +20,8 @@ class Gradient : public PlatformGradientBase
 	~Gradient () noexcept override;
 
 	const PatternHandle& getLinearGradient (CPoint start, CPoint end) const;
-	const PatternHandle& getRadialGradient ();
+	const PatternHandle& getRadialGradient (CPoint center, CCoord radius,
+											CPoint originOffset) const;
 
 private:
 	void changed () override;

vstgui/lib/platform/linux/cairographicscontext.cpp

@@ -624,8 +624,33 @@ bool CairoGraphicsDeviceContext::fillRadialGradient (IPlatformGraphicsPath& path
 	auto cairoPath = dynamic_cast<Cairo::GraphicsPath*> (&path);
 	if (!cairoPath)
 		return false;
-	// TODO: Implementation
-	return false;
+
+	auto cairoGradient = dynamic_cast<const Cairo::Gradient*> (&gradient);
+	if (!cairoGradient)
+		return false;
+	impl->doInContext ([&] () {
+		std::unique_ptr<Cairo::GraphicsPath> alignedPath;
+		if (impl->state.drawMode.integralMode ())
+		{
+			alignedPath = cairoPath->copyPixelAlign ([&] (CPoint p) {
+				p = pixelAlign (impl->state.tm, p);
+				return p;
+			});
+		}
+		auto p = alignedPath ? alignedPath->getCairoPath () : cairoPath->getCairoPath ();
+		cairo_append_path (impl->context, p);
+
+		const auto& radialGradient =
+			cairoGradient->getRadialGradient (center, radius, originOffset);
+		cairo_set_source (impl->context, radialGradient);
+		if (evenOdd)
+			cairo_set_fill_rule (impl->context, CAIRO_FILL_RULE_EVEN_ODD);
+
+		cairo_arc (impl->context, 0, 0, 0, 0., M_PI * 2.);
+		cairo_fill (impl->context);
+	});
+
+	return true;
 }
 
 //------------------------------------------------------------------------

vstgui/lib/platform/mac/cocoa/nsviewdraggingsession.mm

@@ -252,7 +252,7 @@ static Class CreateClass ()
 //-----------------------------------------------------------------------------
 NSImage* NSViewDraggingSession::nsImageForDragOperation (CBitmap* bitmap)
 {
-	return bitmapToNSImage (bitmap);
+	return [bitmapToNSImage (bitmap) autorelease];
 }
 
 //------------------------------------------------------------------------

vstgui/lib/platform/win32/direct2d/d2dgraphicscontext.cpp

@@ -166,48 +166,19 @@ struct D2DGraphicsDeviceContext::Impl
 		auto transform = convert (tmGuard.matrix) * globalTM * state.tm;
 		transform.scale (scaleFactor, scaleFactor);
 		transform.translate (transformOffset);
-		bool useLayer = transform.m12 != 0. || transform.m21 != 0.;
-		if (useLayer)
-		{ // we have a rotated matrix, we need to use a layer
-			COM::Ptr<ID2D1Factory> factory {};
-			deviceContext->GetFactory (factory.adoptPtr ());
-			COM::Ptr<ID2D1RectangleGeometry> geometry;
-			if (SUCCEEDED (
-					factory->CreateRectangleGeometry (convert (state.clip), geometry.adoptPtr ())))
-			{
-				if (applyClip.isEmpty () == false)
-					deviceContext->PopAxisAlignedClip ();
-				deviceContext->PushLayer (D2D1::LayerParameters (D2D1::InfiniteRect (),
-																 geometry.get (),
-																 D2D1_ANTIALIAS_MODE_ALIASED),
-										  nullptr);
-				applyClip = state.clip;
-			}
-			else
-			{
-				useLayer = false;
-			}
-		}
-		if (!useLayer)
+		auto newClip = state.clip;
+		globalTM.transform (newClip);
+		if (applyClip != newClip)
 		{
-			auto newClip = state.clip;
-			globalTM.transform (newClip);
-			if (applyClip != newClip)
-			{
-				if (applyClip.isEmpty () == false)
-					deviceContext->PopAxisAlignedClip ();
-				if (newClip.isEmpty () == false)
-					deviceContext->PushAxisAlignedClip (convert (newClip),
-														D2D1_ANTIALIAS_MODE_ALIASED);
-				applyClip = newClip;
-			}
+			if (applyClip.isEmpty () == false)
+				deviceContext->PopAxisAlignedClip ();
+			if (newClip.isEmpty () == false)
+				deviceContext->PushAxisAlignedClip (convert (newClip), D2D1_ANTIALIAS_MODE_ALIASED);
+			applyClip = newClip;
 		}
 		deviceContext->SetTransform (convert (transform));
 
 		p (deviceContext.get ());
-
-		if (useLayer)
-			deviceContext->PopLayer ();
 	}
 
 	//-----------------------------------------------------------------------------

vstgui/plugin-bindings/vst3editor.cpp

@@ -1534,7 +1534,30 @@ void VST3Editor::save (bool saveAs)
 	}
 	if (savePath.empty ())
 		return;
-	if (description->save (savePath.c_str (), VST3EditorInternal::getUIDescriptionSaveOptions (frame)))
+
+	// filter out attributes we will always override with the values from the parameters
+	auto filter = [] (CView* view, const std::string& name) -> bool {
+		if (auto control = dynamic_cast<CControl*> (view))
+		{
+			if (control->getTag () != -1)
+			{
+				if (name == UIViewCreator::kAttrMinValue)
+					return false;
+				if (name == UIViewCreator::kAttrMaxValue)
+					return false;
+				if (name == UIViewCreator::kAttrDefaultValue)
+					return false;
+				if (name == UIViewCreator::kAttrMouseEnabled)
+					return false;
+				if (name == UIViewCreator::kAttrTitle && dynamic_cast<CTextLabel*> (control))
+					return false;
+			}
+		}
+		return true;
+	};
+
+	if (description->save (savePath.c_str (),
+						   VST3EditorInternal::getUIDescriptionSaveOptions (frame), filter))
 		description->setFilePath (savePath.c_str ());
 }