Attachment #141424 for bug #206835

View | Details | Raw Unified | Return to bug 206835
Collapse All | Expand All




KDoubleNumInput::KDoubleNumInput(double value, QWidget *parent, const char *name)
    : KNumInput(parent, name)
{
    init(value, kMin((double)0, value), kMax((double)0, value), 0.01, 2 );
}

KDoubleNumInput::KDoubleNumInput(KNumInput* below, double value, QWidget* parent,
                                 const char* name)
    : KNumInput(below, parent, name)
{
    init( value, kMin((double)0, value), kMax((double)0, value), 0.01, 2 );
}

KDoubleNumInput::~KDoubleNumInput()




        v = args->next();
        if (!validUnit(v, FNumber, true))
            return false;
        colorArray[3] = static_cast<int>(kMax((double)0, kMin((double)1, v->fValue)) * 255);
    }
    return true;
}

    if (!validUnit(v, FInteger, true))
        return false;
    // normalize the Hue value and change it to be between 0 and 1.0
    colorArray[0] = (((static_cast<int>(v->fValue) % 360) + 360) % 360) / 360;
    for (int i = 1; i < 3; i++) {
        v = args->next();
        if (v->unit != Value::Operator && v->iValue != ',')

        v = args->next();
        if (!validUnit(v, FPercent, true))
            return false;
        colorArray[i] = kMax((double)0, kMin((double)100, v->fValue)) / 100; // needs to be value between 0 and 1.0
    }
    if (parseAlpha) {
        v = args->next();

        v = args->next();
        if (!validUnit(v, FNumber, true))
            return false;
        colorArray[3] = kMax((double)0, kMin((double)1, v->fValue));
    }
    return true;
}

Return to bug 206835

Lines 567-580 Link Here

(-)kdeui/knuminput.cpp (-2 / +2 lines)
567	KDoubleNumInput::KDoubleNumInput(double value, QWidget parent, const char name)	567	KDoubleNumInput::KDoubleNumInput(double value, QWidget parent, const char name)
568	: KNumInput(parent, name)	568	: KNumInput(parent, name)
569	{	569	{
570	init(value, kMin(0.0, value), kMax(0.0, value), 0.01, 2 );	570	init(value, kMin((double)0, value), kMax((double)0, value), 0.01, 2 );
571	}	571	}
572		572
573	KDoubleNumInput::KDoubleNumInput(KNumInput* below, double value, QWidget* parent,	573	KDoubleNumInput::KDoubleNumInput(KNumInput* below, double value, QWidget* parent,
574	const char* name)	574	const char* name)
575	: KNumInput(below, parent, name)	575	: KNumInput(below, parent, name)
576	{	576	{
577	init( value, kMin(0.0, value), kMax(0.0, value), 0.01, 2 );	577	init( value, kMin((double)0, value), kMax((double)0, value), 0.01, 2 );
578	}	578	}
579		579
580	KDoubleNumInput::~KDoubleNumInput()	580	KDoubleNumInput::~KDoubleNumInput()

Lines 1997-2003 Link Here

(-)khtml/css/cssparser.cpp (-4 / +4 lines)
1997	v = args->next();	1997	v = args->next();
1998	if (!validUnit(v, FNumber, true))	1998	if (!validUnit(v, FNumber, true))
1999	return false;	1999	return false;
2000	colorArray[3] = static_cast<int>(kMax(0.0, kMin(1.0, v->fValue)) * 255);	2000	colorArray[3] = static_cast<int>(kMax((double)0, kMin((double)1, v->fValue)) * 255);
2001	}	2001	}
2002	return true;	2002	return true;
2003	}	2003	}
Lines 2015-2021 Link Here
2015	if (!validUnit(v, FInteger, true))	2015	if (!validUnit(v, FInteger, true))
2016	return false;	2016	return false;
2017	// normalize the Hue value and change it to be between 0 and 1.0	2017	// normalize the Hue value and change it to be between 0 and 1.0
2018	colorArray[0] = (((static_cast<int>(v->fValue) % 360) + 360) % 360) / 360.0;	2018	colorArray[0] = (((static_cast<int>(v->fValue) % 360) + 360) % 360) / 360;
2019	for (int i = 1; i < 3; i++) {	2019	for (int i = 1; i < 3; i++) {
2020	v = args->next();	2020	v = args->next();
2021	if (v->unit != Value::Operator && v->iValue != ',')	2021	if (v->unit != Value::Operator && v->iValue != ',')
Lines 2023-2029 Link Here
2023	v = args->next();	2023	v = args->next();
2024	if (!validUnit(v, FPercent, true))	2024	if (!validUnit(v, FPercent, true))
2025	return false;	2025	return false;
2026	colorArray[i] = kMax(0.0, kMin(100.0, v->fValue)) / 100.0; // needs to be value between 0 and 1.0	2026	colorArray[i] = kMax((double)0, kMin((double)100, v->fValue)) / 100; // needs to be value between 0 and 1.0
2027	}	2027	}
2028	if (parseAlpha) {	2028	if (parseAlpha) {
2029	v = args->next();	2029	v = args->next();
Lines 2032-2038 Link Here
2032	v = args->next();	2032	v = args->next();
2033	if (!validUnit(v, FNumber, true))	2033	if (!validUnit(v, FNumber, true))
2034	return false;	2034	return false;
2035	colorArray[3] = kMax(0.0, kMin(1.0, v->fValue));	2035	colorArray[3] = kMax((double)0, kMin((double)1, v->fValue));
2036	}	2036	}
2037	return true;	2037	return true;
2038	}	2038	}