mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-05 05:30:29 +00:00
add multiple palette support
This commit is contained in:
pavlov%netscape.com
parent
83e44aa98f
commit
b999fd558c
@ -83,11 +83,9 @@ nsColorPickerFrame::Init(nsIPresContext& aPresContext,
|
||||
mContent->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::type, type);
|
||||
|
||||
if (type.EqualsIgnoreCase("swatch") || type.Equals(""))
|
||||
mColorPicker = new nsStdColorPicker();
|
||||
if (type.EqualsIgnoreCase("nose"))
|
||||
{
|
||||
printf("nose picker!\n");
|
||||
mColorPicker = new nsStdColorPicker();
|
||||
mColorPicker->Init(mContent);
|
||||
}
|
||||
|
||||
return rv;
|
||||
@ -178,7 +176,7 @@ nsColorPickerFrame::Paint(nsIPresContext& aPresContext,
|
||||
PRBool clipState;
|
||||
|
||||
// Clip so we don't render outside the inner rect
|
||||
aRenderingContext.SetClipRect(rect, nsClipCombine_kIntersect, clipState);
|
||||
aRenderingContext.SetClipRect(rect, nsClipCombine_kIntersect, clipState);
|
||||
|
||||
// call the color picker's paint method
|
||||
mColorPicker->Paint(&aPresContext, &aRenderingContext);
|
||||
@ -217,7 +215,7 @@ nsColorPickerFrame::GetDesiredSize(nsIPresContext* aPresContext,
|
||||
else
|
||||
aDesiredSize.height = -1;
|
||||
|
||||
mColorPicker->SetSize((aDesiredSize.width == -1) ? -1 : aDesiredSize.width/p2t,
|
||||
mColorPicker->SetSize((aDesiredSize.width == -1) ? -1 : aDesiredSize.width /p2t,
|
||||
(aDesiredSize.height == -1) ? -1 : aDesiredSize.height/p2t);
|
||||
|
||||
|
||||
|
||||
@ -41,6 +41,9 @@ class nsIColorPicker : public nsISupports {
|
||||
public:
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOLORPICKER_IID)
|
||||
|
||||
/* void Init (in nsIContent aContent); */
|
||||
NS_IMETHOD Init(nsIContent * aContent) = 0;
|
||||
|
||||
/* void Paint (in nsIPresContext aPresContext, in nsIRenderingContext aRenderingContext); */
|
||||
NS_IMETHOD Paint(nsIPresContext * aPresContext, nsIRenderingContext * aRenderingContext) = 0;
|
||||
|
||||
@ -56,6 +59,7 @@ class nsIColorPicker : public nsISupports {
|
||||
|
||||
/* Use this macro when declaring classes that implement this interface. */
|
||||
#define NS_DECL_NSICOLORPICKER \
|
||||
NS_IMETHOD Init(nsIContent * aContent); \
|
||||
NS_IMETHOD Paint(nsIPresContext * aPresContext, nsIRenderingContext * aRenderingContext); \
|
||||
NS_IMETHOD GetColor(PRInt32 aX, PRInt32 aY, char **aColor); \
|
||||
NS_IMETHOD SetSize(PRInt32 aWidth, PRInt32 aHeight); \
|
||||
@ -63,6 +67,7 @@ class nsIColorPicker : public nsISupports {
|
||||
|
||||
/* Use this macro to declare functions that forward the behavior of this interface to another object. */
|
||||
#define NS_FORWARD_NSICOLORPICKER(_to) \
|
||||
NS_IMETHOD Init(nsIContent * aContent) { return _to ## Init(aContent); } \
|
||||
NS_IMETHOD Paint(nsIPresContext * aPresContext, nsIRenderingContext * aRenderingContext) { return _to ## Paint(aPresContext, aRenderingContext); } \
|
||||
NS_IMETHOD GetColor(PRInt32 aX, PRInt32 aY, char **aColor) { return _to ## GetColor(aX, aY, aColor); } \
|
||||
NS_IMETHOD SetSize(PRInt32 aWidth, PRInt32 aHeight) { return _to ## SetSize(aWidth, aHeight); } \
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
#include "nsColor.h"
|
||||
#include "nsCRT.h"
|
||||
|
||||
#include "nsXULAtoms.h"
|
||||
#include "nsIDOMElement.h"
|
||||
#include "nsIContent.h"
|
||||
#include "prtypes.h"
|
||||
@ -34,24 +35,61 @@
|
||||
#include "nsCSSRendering.h"
|
||||
#include "nsINameSpaceManager.h"
|
||||
|
||||
static char *NosePalette[] = {
|
||||
"#00FF00","#00ED00","#00DB00","#00C900","#00B700","#00A500","#009300","#008100","#006F00","#005D00",
|
||||
"#FFFF00","#EDED00","#DBDB00","#C9C900","#B7B700","#A5A500","#939300","#818100","#6F6F00","#5D5D00",
|
||||
"#FFFF00","#F5ED00","#EBDB00","#E1C900","#D7B700","#CDA500","#C39300","#B98100","#AF6F00","#A55D00"
|
||||
};
|
||||
|
||||
static char* StandardPalette[] = {
|
||||
"#FFFFFF","#FFCCCC","#FFCC99","#FFFF99","#FFFFCC","#99FF99","#99FFFF","#CCFFFF","#CCCCFF","#FFCCFF",
|
||||
"#CCCCCC","#FF6666","#FFCC33","#FFFF66","#FFFF99","#66FF99","#33FFFF","#66FFFF","#9999FF","#FF99FF",
|
||||
"#EEEEEE","#FF6666","#FFCC33","#FFFF66","#FFFF99","#66FF99","#33FFFF","#66FFFF","#9999FF","#FF99FF",
|
||||
"#CCCCCC","#FF0000","#FF9900","#FFCC66","#FFFF00","#33FF33","#66CCCC","#33CCFF","#6666CC","#CC66CC",
|
||||
"#999999","#CC0000","#FF6600","#FFCC33","#FFCC00","#33CC00","#00CCCC","#3366FF","#6633FF","#CC33CC",
|
||||
"#666666","#990000","#CC6600","#CC9933","#999900","#009900","#339999","#3333FF","#6600CC","#993399",
|
||||
"#333333","#660000","#993300","#996633","#666600","#006600","#336666","#000099","#333399","#663366",
|
||||
"#000000","#330000","#663300","#663333","#333300","#003300","#003333","#000066","#330099","#330033"
|
||||
};
|
||||
static int nColors = sizeof(StandardPalette) / sizeof(char *);
|
||||
|
||||
static char *WebPalette[] = {
|
||||
"#FFFFFF", "#FFFFCC", "#FFFF99", "#FFFF66", "#FFFF33", "#FFFF00", "#FFCCFF", "#FFCCCC",
|
||||
"#FFCC99", "#FFCC66", "#FFCC33", "#FFCC00", "#FF99FF", "#FF99CC", "#FF9999", "#FF9966",
|
||||
"#FF9933", "#FF9900", "#FF66FF", "#FF66CC", "#FF6699", "#FF6666", "#FF6633", "#FF6600",
|
||||
"#FF33FF", "#FF33CC", "#FF3399", "#FF3366", "#FF3333", "#FF3300", "#FF00FF", "#FF00CC",
|
||||
"#FF0099", "#FF0066", "#FF0033", "#FF0000", "#CCFFFF", "#CCFFCC", "#CCFF99", "#CCFF66",
|
||||
"#CCFF33", "#CCFF00", "#CCCCFF", "#CCCCCC", "#CCCC99", "#CCCC66", "#CCCC33", "#CCCC00",
|
||||
"#CC99FF", "#CC99CC", "#CC9999", "#CC9966", "#CC9933", "#CC9900", "#CC66FF", "#CC66CC",
|
||||
"#CC6699", "#CC6666", "#CC6633", "#CC6600", "#CC33FF", "#CC33CC", "#CC3399", "#CC3366",
|
||||
"#CC3333", "#CC3300", "#CC00FF", "#CC00CC", "#CC0099", "#CC0066", "#CC0033", "#CC0000",
|
||||
"#99FFFF", "#99FFCC", "#99FF99", "#99FF66", "#99FF33", "#99FF00", "#99CCFF", "#99CCCC",
|
||||
"#99CC99", "#99CC66", "#99CC33", "#99CC00", "#9999FF", "#9999CC", "#999999", "#999966",
|
||||
"#999933", "#999900", "#9966FF", "#9966CC", "#996699", "#996666", "#996633", "#996600",
|
||||
"#9933FF", "#9933CC", "#993399", "#993366", "#993333", "#993300", "#9900FF", "#9900CC",
|
||||
"#990099", "#990066", "#990033", "#990000", "#66FFFF", "#66FFCC", "#66FF99", "#66FF66",
|
||||
"#66FF33", "#66FF00", "#66CCFF", "#66CCCC", "#66CC99", "#66CC66", "#66CC33", "#66CC00",
|
||||
"#6699FF", "#6699CC", "#669999", "#669966", "#669933", "#669900", "#6666FF", "#6666CC",
|
||||
"#666699", "#666666", "#666633", "#666600", "#6633FF", "#6633CC", "#663399", "#663366",
|
||||
"#663333", "#663300", "#6600FF", "#6600CC", "#660099", "#660066", "#660033", "#660000",
|
||||
"#33FFFF", "#33FFCC", "#33FF99", "#33FF66", "#33FF33", "#33FF00", "#33CCFF", "#33CCCC",
|
||||
"#33CC99", "#33CC66", "#33CC33", "#33CC00", "#3399FF", "#3399CC", "#339999", "#339966",
|
||||
"#339933", "#339900", "#3366FF", "#3366CC", "#336699", "#336666", "#336633", "#336600",
|
||||
"#3333FF", "#3333CC", "#333399", "#333366", "#333333", "#333300", "#3300FF", "#3300CC",
|
||||
"#330099", "#330066", "#330033", "#330000", "#00FFFF", "#00FFCC", "#00FF99", "#00FF66",
|
||||
"#00FF33", "#00FF00", "#00CCFF", "#00CCCC", "#00CC99", "#00CC66", "#00CC33", "#00CC00",
|
||||
"#0099FF", "#0099CC", "#009999", "#009966", "#009933", "#009900", "#0066FF", "#0066CC",
|
||||
"#006699", "#006666", "#006633", "#006600", "#0033FF", "#0033CC", "#003399", "#003366",
|
||||
"#003333", "#003300", "#0000FF", "#0000CC", "#000099", "#000066", "#000033", "#000000"
|
||||
};
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsStdColorPicker, nsIColorPicker)
|
||||
|
||||
nsStdColorPicker::nsStdColorPicker()
|
||||
{
|
||||
mNumCols = 10; // NSToIntRound(sqrt(nColors));
|
||||
mNumRows = NSToIntRound(nColors/mNumCols);
|
||||
mColors = 0;
|
||||
|
||||
mNumCols = 0;
|
||||
mNumRows = 0;
|
||||
|
||||
mFrameWidth = 0;
|
||||
mFrameHeight = 0;
|
||||
@ -65,6 +103,38 @@ nsStdColorPicker::~nsStdColorPicker()
|
||||
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsStdColorPicker::Init(nsIContent *aContent)
|
||||
{
|
||||
nsAutoString palette;
|
||||
aContent->GetAttribute(kNameSpaceID_None, nsXULAtoms::palettename, palette);
|
||||
|
||||
if (palette.EqualsIgnoreCase("standard") || palette.Equals(""))
|
||||
{
|
||||
printf("standard picked\n");
|
||||
mPalette = StandardPalette;
|
||||
mNumCols = 10;
|
||||
mColors = sizeof(StandardPalette) / sizeof(char *);
|
||||
}
|
||||
else if (palette.EqualsIgnoreCase("web"))
|
||||
{
|
||||
printf("web picked\n");
|
||||
mPalette = WebPalette;
|
||||
mNumCols = 15;
|
||||
mColors = sizeof(WebPalette) / sizeof(char *);
|
||||
}
|
||||
else if (palette.EqualsIgnoreCase("nose"))
|
||||
{
|
||||
printf("nose picked\n");
|
||||
mPalette = NosePalette;
|
||||
mNumCols = 10;
|
||||
mColors = sizeof(NosePalette) / sizeof(char *);
|
||||
}
|
||||
|
||||
mNumRows = NSToIntCeil(mColors/mNumCols);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsStdColorPicker::Paint(nsIPresContext * aPresContext, nsIRenderingContext * aRenderingContext)
|
||||
{
|
||||
int i = 0;
|
||||
@ -82,9 +152,9 @@ NS_IMETHODIMP nsStdColorPicker::Paint(nsIPresContext * aPresContext, nsIRenderin
|
||||
// aRenderingContext->SetColor(0);
|
||||
// aRenderingContext->FillRect(0, 0, (mNumCols)*width, mNumRows*height);
|
||||
|
||||
for (i=0;i<nColors;i++)
|
||||
for (i=0;i<mColors;i++)
|
||||
{
|
||||
NS_LooseHexToRGB(StandardPalette[i], &color);
|
||||
NS_LooseHexToRGB(mPalette[i], &color);
|
||||
|
||||
aRenderingContext->SetColor(color);
|
||||
aRenderingContext->FillRect(col*width, row*height, width, height);
|
||||
@ -109,12 +179,12 @@ NS_IMETHODIMP nsStdColorPicker::GetColor(PRInt32 aX, PRInt32 aY, char **aColor)
|
||||
|
||||
int f = mNumCols * cur_row + cur_col;
|
||||
|
||||
if (f >= nColors)
|
||||
if (f >= mColors)
|
||||
{
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
*aColor = nsCRT::strdup(StandardPalette[(int)f]);
|
||||
*aColor = nsCRT::strdup(mPalette[f]);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -41,6 +41,9 @@ public:
|
||||
NS_DECL_NSICOLORPICKER
|
||||
|
||||
private:
|
||||
char **mPalette;
|
||||
PRInt32 mColors;
|
||||
|
||||
PRInt32 mNumCols;
|
||||
PRInt32 mNumRows;
|
||||
PRInt32 mBlockWidth;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user