wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 966417 - Call Update from nsColorPicker on Gtk. r=karlt

Browse Source
This commit is contained in:
Tom Schuster 2014-02-18 20:44:01 +01:00
parent a13a658926
commit 276cdf0a1b
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
widget/gtk/nsColorPicker.cpp
View File

@ -15,11 +15,11 @@ NS_IMPL_ISUPPORTS1(nsColorPicker, nsIColorPicker)
int nsColorPicker::convertGdkColorComponent(guint16 color_component) {
// GdkColor value is in range [0..65535]. We need something in range [0..255]
return (int(color_component)*255 + 127)/65535;
return (color_component * 255 + 127) / 65535;
}
guint16 nsColorPicker::convertToGdkColorComponent(int color_component) {
return color_component*65535/255;
return color_component * 65535 / 255;
}
GdkColor nsColorPicker::convertToGdkColor(nscolor color) {
@ -31,6 +31,12 @@ GdkColor nsColorPicker::convertToGdkColor(nscolor color) {
return result;
}
GtkColorSelection* nsColorPicker::WidgetGetColorSelection(GtkWidget* widget)
{
return GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(
GTK_COLOR_SELECTION_DIALOG(widget)));
}
/* void init (in nsIDOMWindow parent, in AString title, in short mode); */
NS_IMETHODIMP nsColorPicker::Init(nsIDOMWindow *parent,
const nsAString& title,
@ -77,12 +83,12 @@ NS_IMETHODIMP nsColorPicker::Open(nsIColorPickerShownCallback *aColorPickerShown
gtk_window_set_destroy_with_parent(window, TRUE);
}
gtk_color_selection_set_current_color(
GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(
GTK_COLOR_SELECTION_DIALOG(color_chooser))),
&mDefaultColor);
gtk_color_selection_set_current_color(WidgetGetColorSelection(color_chooser),
&mDefaultColor);
NS_ADDREF_THIS();
g_signal_connect(WidgetGetColorSelection(color_chooser), "color-changed",
G_CALLBACK(OnColorChanged), this);
g_signal_connect(color_chooser, "response", G_CALLBACK(OnResponse), this);
g_signal_connect(color_chooser, "destroy", G_CALLBACK(OnDestroy), this);
gtk_widget_show(color_chooser);
@ -90,6 +96,13 @@ NS_IMETHODIMP nsColorPicker::Open(nsIColorPickerShownCallback *aColorPickerShown
return NS_OK;
}
/* static */ void
nsColorPicker::OnColorChanged(GtkColorSelection* colorselection,
gpointer user_data)
{
static_cast<nsColorPicker*>(user_data)->Update(colorselection);
}
/* static */ void
nsColorPicker::OnResponse(GtkWidget* color_chooser, gint response_id,
gpointer user_data)
@ -105,13 +118,22 @@ nsColorPicker::OnDestroy(GtkWidget* color_chooser, gpointer user_data)
Done(color_chooser, GTK_RESPONSE_CANCEL);
}
void
nsColorPicker::Update(GtkColorSelection* colorselection)
{
ReadValueFromColorSelection(colorselection);
if (mCallback) {
mCallback->Update(mColor);
}
}
void
nsColorPicker::Done(GtkWidget* color_chooser, gint response)
{
switch (response) {
case GTK_RESPONSE_OK:
case GTK_RESPONSE_ACCEPT:
ReadValueFromColorChooser(color_chooser);
ReadValueFromColorSelection(WidgetGetColorSelection(color_chooser));
break;
case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_CLOSE:
@ -145,13 +167,10 @@ nsString nsColorPicker::ToHexString(int n)
return result;
}
void nsColorPicker::ReadValueFromColorChooser(GtkWidget* color_chooser)
void nsColorPicker::ReadValueFromColorSelection(GtkColorSelection* colorselection)
{
GdkColor rgba;
gtk_color_selection_get_current_color(
GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(
GTK_COLOR_SELECTION_DIALOG(color_chooser))),
&rgba);
gtk_color_selection_get_current_color(colorselection, &rgba);
mColor.AssignLiteral("#");
mColor += ToHexString(convertGdkColorComponent(rgba.red));

7
widget/gtk/nsColorPicker.h
View File

@ -25,6 +25,8 @@ public:
private:
~nsColorPicker() {};
static void OnColorChanged(GtkColorSelection* colorselection,
gpointer user_data);
static void OnResponse(GtkWidget* dialog, gint response_id,
gpointer user_data);
static void OnDestroy(GtkWidget* dialog, gpointer user_data);
@ -35,8 +37,11 @@ private:
static GdkColor convertToGdkColor(nscolor color);
static nsString ToHexString(int n);
static GtkColorSelection* WidgetGetColorSelection(GtkWidget* widget);
void Done(GtkWidget* dialog, gint response_id);
void ReadValueFromColorChooser(GtkWidget* color_chooser);
void Update(GtkColorSelection* colorselection);
void ReadValueFromColorSelection(GtkColorSelection* colorselection);
nsCOMPtr<nsIWidget> mParentWidget;
nsCOMPtr<nsIColorPickerShownCallback> mCallback;