"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libs/ui/widgets/KoFillConfigWidget.cpp" between
krita-5.1.3.tar.xz and krita-5.1.4.tar.xz

About: Krita is a painting program offering art tools for everyone (concept art, texture and matte painters, illustrations and comics).

KoFillConfigWidget.cpp  (krita-5.1.3.tar.xz)	:	KoFillConfigWidget.cpp  (krita-5.1.4.tar.xz)
skipping to change at line 390		skipping to change at line 390
void KoFillConfigWidget::slotCanvasResourceChanged(int key, const QVariant &valu e)		void KoFillConfigWidget::slotCanvasResourceChanged(int key, const QVariant &valu e)
{		{
if (key == KoCanvasResource::ForegroundColor		if (key == KoCanvasResource::ForegroundColor
|| key == KoCanvasResource::BackgroundColor) {		|| key == KoCanvasResource::BackgroundColor) {
KoColor color = value.value<KoColor>();		KoColor color = value.value<KoColor>();
const int checkedId = d->group->checkedId();		const int checkedId = d->group->checkedId();
if ((checkedId < 0 || checkedId == None || checkedId == Solid) &&		if (checkedId < 0 || checkedId == None || checkedId == Solid) {
!(checkedId == Solid && d->colorAction->currentKoColor() == color))
{
d->group->button(Solid)->setChecked(true);		d->group->button(Solid)->setChecked(true);
d->selectedFillIndex = Solid;		d->selectedFillIndex = Solid;
KoFlake::FillVariant colorSlot = (key == KoCanvasResource::Foregroun dColor)		KoFlake::FillVariant colorSlot = (key == KoCanvasResource::Foregroun dColor)
? KoFlake::Fill		? KoFlake::Fill
: KoFlake::StrokeFill;		: KoFlake::StrokeFill;
d->colorAction->setCurrentColor(color);		if (key == d->fillVariant) {
		d->colorAction->setCurrentColor(color);
		}
colorChanged({color.toQColor(), colorSlot});		colorChanged({color.toQColor(), colorSlot});
} else if (checkedId == Gradient && key == KoCanvasResource::ForegroundC olor) {		} else if (checkedId == Gradient && key == KoCanvasResource::ForegroundC olor) {
d->ui->wdgGradientEditor->notifyGlobalColorChanged(color);		d->ui->wdgGradientEditor->notifyGlobalColorChanged(color);
}		}
} else if (key == KoCanvasResource::CurrentGradient) {		} else if (key == KoCanvasResource::CurrentGradient) {
KoResourceSP gradient = value.value<KoAbstractGradientSP>();		KoResourceSP gradient = value.value<KoAbstractGradientSP>();
const int checkedId = d->group->checkedId();		const int checkedId = d->group->checkedId();
if (gradient && (checkedId < 0 || checkedId == None || checkedId == Grad ient)) {		if (gradient && (checkedId < 0 || checkedId == None || checkedId == Grad ient)) {
d->group->button(Gradient)->setChecked(true);		d->group->button(Gradient)->setChecked(true);
skipping to change at line 553		skipping to change at line 554
// * line to test out		// * line to test out
QColor solidColor = d->colorAction->currentColor();		QColor solidColor = d->colorAction->currentColor();
solidColor.setAlpha(255);		solidColor.setAlpha(255);
command = wrapper.setColor(solidColor);		command = wrapper.setColor(solidColor);
if (command) {		if (command) {
d->canvas->addCommand(command);		d->canvas->addCommand(command);
}		}
}		}
d->colorAction->setCurrentColor(wrapper.color());
emit sigFillChanged();		emit sigFillChanged();
emit sigInternalRequestColorToResourceManager();		emit sigInternalRequestColorToResourceManager();
}		}
void KoFillConfigWidget::slotProposeCurrentColorToResourceManager()		void KoFillConfigWidget::slotProposeCurrentColorToResourceManager()
{		{
const int checkedId = d->group->checkedId();		const int checkedId = d->group->checkedId();
auto uploadColorToResourceManager = [this](KoCanvasResource::CanvasResourceI d res,		auto uploadColorToResourceManager = [this](KoCanvasResource::CanvasResourceI d res,
KoFlake::FillVariant var, KoColor &color) {		KoFlake::FillVariant var, KoColor &color) {
End of changes. 3 change blocks.
6 lines changed or deleted		4 lines changed or added

---