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 1198256 - Reactivate the old Gtk color picker for now. r=karlt

Browse Source
This commit is contained in:
Arnaud Bienner 2015-10-17 14:57:22 +02:00
parent e871d975b9
commit f606b89d51
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widget/gtk/nsColorPicker.cpp
View File

@ -13,7 +13,7 @@
NS_IMPL_ISUPPORTS(nsColorPicker, nsIColorPicker)
#if GTK_CHECK_VERSION(3,4,0)
#if defined(ACTIVATE_GTK3_COLOR_PICKER) && GTK_CHECK_VERSION(3,4,0)
int nsColorPicker::convertGdkRgbaComponent(gdouble color_component) {
// GdkRGBA value is in range [0.0..1.0]. We need something in range [0..255]
return color_component * 255 + 0.5;
@ -94,7 +94,7 @@ NS_IMETHODIMP nsColorPicker::Open(nsIColorPickerShownCallback *aColorPickerShown
title.Adopt(ToNewUTF8String(mTitle));
GtkWindow *parent_window = GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
#if GTK_CHECK_VERSION(3,4,0)
#if defined(ACTIVATE_GTK3_COLOR_PICKER) && GTK_CHECK_VERSION(3,4,0)
GtkWidget* color_chooser = gtk_color_chooser_dialog_new(title, parent_window);
if (parent_window) {
@ -134,7 +134,7 @@ NS_IMETHODIMP nsColorPicker::Open(nsIColorPickerShownCallback *aColorPickerShown
return NS_OK;
}
#if GTK_CHECK_VERSION(3,4,0)
#if defined(ACTIVATE_GTK3_COLOR_PICKER) && GTK_CHECK_VERSION(3,4,0)
/* static */ void
nsColorPicker::OnColorChanged(GtkColorChooser* color_chooser, GdkRGBA* color,
gpointer user_data)
@ -208,7 +208,7 @@ nsColorPicker::Done(GtkWidget* color_chooser, gint response)
switch (response) {
case GTK_RESPONSE_OK:
case GTK_RESPONSE_ACCEPT:
#if GTK_CHECK_VERSION(3,4,0)
#if defined(ACTIVATE_GTK3_COLOR_PICKER) && GTK_CHECK_VERSION(3,4,0)
GdkRGBA color;
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(color_chooser), &color);
SetColor(&color);

7
widget/gtk/nsColorPicker.h
View File

@ -12,6 +12,11 @@
#include "nsIColorPicker.h"
#include "nsString.h"
// Don't activate the GTK3 color picker for now, because it is missing a few
// things, mainly the ability to let the user select a color on the screen.
// See bug 1198256.
#undef ACTIVATE_GTK3_COLOR_PICKER
class nsIWidget;
class nsColorPicker final : public nsIColorPicker
@ -31,7 +36,7 @@ private:
gpointer user_data);
static void OnDestroy(GtkWidget* dialog, gpointer user_data);
#if GTK_CHECK_VERSION(3,4,0)
#if defined(ACTIVATE_GTK3_COLOR_PICKER) && GTK_CHECK_VERSION(3,4,0)
static void OnColorChanged(GtkColorChooser* color_chooser, GdkRGBA* color,
gpointer user_data);