Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.

Implement StyleContext::{get_color, lookup_color} #462

Merged
merged 2 commits into from
Mar 11, 2017
Merged

Implement StyleContext::{get_color, lookup_color} #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b16fe1
Update for new gdk::RGBA type
Susurrus Mar 8, 2017
75e6a7f
Regen
Susurrus Mar 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gir.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ manual = [
"Gdk.ModifierIntent",
"Gdk.ModifierType",
"Gdk.Rectangle",
"Gdk.RGBA",
"Gdk.Screen",
"Gdk.Visual",
"Gdk.Window",
Expand Down
12 changes: 6 additions & 6 deletions src/auto/cell_renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pub trait CellRendererExt {

fn set_property_cell_background(&self, cell_background: Option<&str>);

//fn set_property_cell_background_rgba(&self, cell_background_rgba: /*Ignored*/Option<&gdk::RGBA>);
fn set_property_cell_background_rgba(&self, cell_background_rgba: Option<&gdk::RGBA>);

fn get_property_cell_background_set(&self) -> bool;

Expand Down Expand Up @@ -302,11 +302,11 @@ impl<O: IsA<CellRenderer> + IsA<Object>> CellRendererExt for O {
}
}

//fn set_property_cell_background_rgba(&self, cell_background_rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "cell-background-rgba".to_glib_none().0, Value::from(cell_background_rgba).to_glib_none().0);
// }
//}
fn set_property_cell_background_rgba(&self, cell_background_rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "cell-background-rgba".to_glib_none().0, Value::from(cell_background_rgba).to_glib_none().0);
}
}

fn get_property_cell_background_set(&self) -> bool {
let mut value = Value::from(&false);
Expand Down
25 changes: 13 additions & 12 deletions src/auto/cell_renderer_text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use CellRenderer;
use Object;
use TreePath;
use ffi;
use gdk;
use glib::Value;
use glib::object::Downcast;
use glib::object::IsA;
Expand Down Expand Up @@ -48,7 +49,7 @@ pub trait CellRendererTextExt {

fn set_property_background(&self, background: Option<&str>);

//fn set_property_background_rgba(&self, background_rgba: /*Ignored*/Option<&gdk::RGBA>);
fn set_property_background_rgba(&self, background_rgba: Option<&gdk::RGBA>);

fn get_property_background_set(&self) -> bool;

Expand Down Expand Up @@ -84,7 +85,7 @@ pub trait CellRendererTextExt {

fn set_property_foreground(&self, foreground: Option<&str>);

//fn set_property_foreground_rgba(&self, foreground_rgba: /*Ignored*/Option<&gdk::RGBA>);
fn set_property_foreground_rgba(&self, foreground_rgba: Option<&gdk::RGBA>);

fn get_property_foreground_set(&self) -> bool;

Expand Down Expand Up @@ -255,11 +256,11 @@ impl<O: IsA<CellRendererText> + IsA<Object>> CellRendererTextExt for O {
}
}

//fn set_property_background_rgba(&self, background_rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "background-rgba".to_glib_none().0, Value::from(background_rgba).to_glib_none().0);
// }
//}
fn set_property_background_rgba(&self, background_rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "background-rgba".to_glib_none().0, Value::from(background_rgba).to_glib_none().0);
}
}

fn get_property_background_set(&self) -> bool {
let mut value = Value::from(&false);
Expand Down Expand Up @@ -380,11 +381,11 @@ impl<O: IsA<CellRendererText> + IsA<Object>> CellRendererTextExt for O {
}
}

//fn set_property_foreground_rgba(&self, foreground_rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "foreground-rgba".to_glib_none().0, Value::from(foreground_rgba).to_glib_none().0);
// }
//}
fn set_property_foreground_rgba(&self, foreground_rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "foreground-rgba".to_glib_none().0, Value::from(foreground_rgba).to_glib_none().0);
}
}

fn get_property_foreground_set(&self) -> bool {
let mut value = Value::from(&false);
Expand Down
20 changes: 12 additions & 8 deletions src/auto/color_button.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use ColorChooser;
use Container;
use Widget;
use ffi;
use gdk;
use glib::Value;
use glib::object::Downcast;
use glib::signal::connect;
Expand All @@ -33,9 +34,12 @@ impl ColorButton {
}
}

//pub fn new_with_rgba(rgba: /*Ignored*/&gdk::RGBA) -> ColorButton {
// unsafe { TODO: call ffi::gtk_color_button_new_with_rgba() }
//}
pub fn new_with_rgba(rgba: &gdk::RGBA) -> ColorButton {
assert_initialized_main_thread!();
unsafe {
Widget::from_glib_none(ffi::gtk_color_button_new_with_rgba(rgba.to_glib_none().0)).downcast_unchecked()
}
}

pub fn get_title(&self) -> Option<String> {
unsafe {
Expand Down Expand Up @@ -67,11 +71,11 @@ impl ColorButton {
}
}

//pub fn set_property_rgba(&self, rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "rgba".to_glib_none().0, Value::from(rgba).to_glib_none().0);
// }
//}
pub fn set_property_rgba(&self, rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "rgba".to_glib_none().0, Value::from(rgba).to_glib_none().0);
}
}

#[cfg(feature = "v3_20")]
pub fn get_property_show_editor(&self) -> bool {
Expand Down
40 changes: 28 additions & 12 deletions src/auto/style_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,33 @@ impl StyleContext {
// unsafe { TODO: call ffi::gtk_style_context_get() }
//}

//pub fn get_background_color(&self, state: StateFlags, color: /*Ignored*/gdk::RGBA) {
// unsafe { TODO: call ffi::gtk_style_context_get_background_color() }
//}
pub fn get_background_color(&self, state: StateFlags) -> gdk::RGBA {
unsafe {
let mut color = gdk::RGBA::uninitialized();
ffi::gtk_style_context_get_background_color(self.to_glib_none().0, state.to_glib(), color.to_glib_none_mut().0);
color
}
}

//pub fn get_border(&self, state: StateFlags, border: /*Ignored*/Border) {
// unsafe { TODO: call ffi::gtk_style_context_get_border() }
//}

//pub fn get_border_color(&self, state: StateFlags, color: /*Ignored*/gdk::RGBA) {
// unsafe { TODO: call ffi::gtk_style_context_get_border_color() }
//}
pub fn get_border_color(&self, state: StateFlags) -> gdk::RGBA {
unsafe {
let mut color = gdk::RGBA::uninitialized();
ffi::gtk_style_context_get_border_color(self.to_glib_none().0, state.to_glib(), color.to_glib_none_mut().0);
color
}
}

//pub fn get_color(&self, state: StateFlags, color: /*Ignored*/gdk::RGBA) {
// unsafe { TODO: call ffi::gtk_style_context_get_color() }
//}
pub fn get_color(&self, state: StateFlags) -> gdk::RGBA {
unsafe {
let mut color = gdk::RGBA::uninitialized();
ffi::gtk_style_context_get_color(self.to_glib_none().0, state.to_glib(), color.to_glib_none_mut().0);
color
}
}

pub fn get_direction(&self) -> TextDirection {
unsafe {
Expand Down Expand Up @@ -188,9 +200,13 @@ impl StyleContext {
}
}

//pub fn lookup_color(&self, color_name: &str, color: /*Ignored*/gdk::RGBA) -> bool {
// unsafe { TODO: call ffi::gtk_style_context_lookup_color() }
//}
pub fn lookup_color(&self, color_name: &str) -> Option<gdk::RGBA> {
unsafe {
let mut color = gdk::RGBA::uninitialized();
let ret = from_glib(ffi::gtk_style_context_lookup_color(self.to_glib_none().0, color_name.to_glib_none().0, color.to_glib_none_mut().0));
if ret { Some(color) } else { None }
}
}

//pub fn lookup_icon_set(&self, stock_id: &str) -> /*Ignored*/Option<IconSet> {
// unsafe { TODO: call ffi::gtk_style_context_lookup_icon_set() }
Expand Down
21 changes: 15 additions & 6 deletions src/auto/symbolic_color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// This file was generated by gir (c3b4020) from gir-files (71d73f0)
// DO NOT EDIT

use StyleProperties;
use ffi;
use gdk;
use glib::translate::*;
use std::fmt;

Expand All @@ -22,9 +24,12 @@ impl SymbolicColor {
}
}

//pub fn new_literal(color: /*Ignored*/&gdk::RGBA) -> SymbolicColor {
// unsafe { TODO: call ffi::gtk_symbolic_color_new_literal() }
//}
pub fn new_literal(color: &gdk::RGBA) -> SymbolicColor {
assert_initialized_main_thread!();
unsafe {
from_glib_full(ffi::gtk_symbolic_color_new_literal(color.to_glib_none().0))
}
}

pub fn new_mix(color1: &SymbolicColor, color2: &SymbolicColor, factor: f64) -> SymbolicColor {
assert_initialized_main_thread!();
Expand Down Expand Up @@ -54,9 +59,13 @@ impl SymbolicColor {
}
}

//pub fn resolve(&self, props: Option<&StyleProperties>, resolved_color: /*Ignored*/gdk::RGBA) -> bool {
// unsafe { TODO: call ffi::gtk_symbolic_color_resolve() }
//}
pub fn resolve(&self, props: Option<&StyleProperties>) -> Option<gdk::RGBA> {
unsafe {
let mut resolved_color = gdk::RGBA::uninitialized();
let ret = from_glib(ffi::gtk_symbolic_color_resolve(self.to_glib_none().0, props.to_glib_none().0, resolved_color.to_glib_none_mut().0));
if ret { Some(resolved_color) } else { None }
}
}

fn to_string(&self) -> String {
unsafe {
Expand Down
54 changes: 27 additions & 27 deletions src/auto/text_tag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ impl TextTag {
}
}

//pub fn set_property_background_rgba(&self, background_rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "background-rgba".to_glib_none().0, Value::from(background_rgba).to_glib_none().0);
// }
//}
pub fn set_property_background_rgba(&self, background_rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "background-rgba".to_glib_none().0, Value::from(background_rgba).to_glib_none().0);
}
}

pub fn get_property_background_set(&self) -> bool {
let mut value = Value::from(&false);
Expand Down Expand Up @@ -279,11 +279,11 @@ impl TextTag {
}
}

//pub fn set_property_foreground_rgba(&self, foreground_rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "foreground-rgba".to_glib_none().0, Value::from(foreground_rgba).to_glib_none().0);
// }
//}
pub fn set_property_foreground_rgba(&self, foreground_rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "foreground-rgba".to_glib_none().0, Value::from(foreground_rgba).to_glib_none().0);
}
}

pub fn get_property_foreground_set(&self) -> bool {
let mut value = Value::from(&false);
Expand Down Expand Up @@ -490,11 +490,11 @@ impl TextTag {
}
}

//pub fn set_property_paragraph_background_rgba(&self, paragraph_background_rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "paragraph-background-rgba".to_glib_none().0, Value::from(paragraph_background_rgba).to_glib_none().0);
// }
//}
pub fn set_property_paragraph_background_rgba(&self, paragraph_background_rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "paragraph-background-rgba".to_glib_none().0, Value::from(paragraph_background_rgba).to_glib_none().0);
}
}

pub fn get_property_paragraph_background_set(&self) -> bool {
let mut value = Value::from(&false);
Expand Down Expand Up @@ -763,12 +763,12 @@ impl TextTag {
}
}

//#[cfg(feature = "v3_16")]
//pub fn set_property_strikethrough_rgba(&self, strikethrough_rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "strikethrough-rgba".to_glib_none().0, Value::from(strikethrough_rgba).to_glib_none().0);
// }
//}
#[cfg(feature = "v3_16")]
pub fn set_property_strikethrough_rgba(&self, strikethrough_rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "strikethrough-rgba".to_glib_none().0, Value::from(strikethrough_rgba).to_glib_none().0);
}
}

#[cfg(feature = "v3_16")]
pub fn get_property_strikethrough_rgba_set(&self) -> bool {
Expand Down Expand Up @@ -864,12 +864,12 @@ impl TextTag {
// }
//}

//#[cfg(feature = "v3_16")]
//pub fn set_property_underline_rgba(&self, underline_rgba: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe {
// gobject_ffi::g_object_set_property(self.to_glib_none().0, "underline-rgba".to_glib_none().0, Value::from(underline_rgba).to_glib_none().0);
// }
//}
#[cfg(feature = "v3_16")]
pub fn set_property_underline_rgba(&self, underline_rgba: Option<&gdk::RGBA>) {
unsafe {
gobject_ffi::g_object_set_property(self.to_glib_none().0, "underline-rgba".to_glib_none().0, Value::from(underline_rgba).to_glib_none().0);
}
}

#[cfg(feature = "v3_16")]
pub fn get_property_underline_rgba_set(&self) -> bool {
Expand Down
40 changes: 24 additions & 16 deletions src/auto/widget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,15 +405,15 @@ pub trait WidgetExt {

fn mnemonic_activate(&self, group_cycling: bool) -> bool;

//fn override_background_color(&self, state: StateFlags, color: /*Ignored*/Option<&gdk::RGBA>);
fn override_background_color(&self, state: StateFlags, color: Option<&gdk::RGBA>);

//fn override_color(&self, state: StateFlags, color: /*Ignored*/Option<&gdk::RGBA>);
fn override_color(&self, state: StateFlags, color: Option<&gdk::RGBA>);

//fn override_cursor(&self, cursor: /*Ignored*/Option<&gdk::RGBA>, secondary_cursor: /*Ignored*/Option<&gdk::RGBA>);
fn override_cursor(&self, cursor: Option<&gdk::RGBA>, secondary_cursor: Option<&gdk::RGBA>);

fn override_font(&self, font_desc: Option<&pango::FontDescription>);

//fn override_symbolic_color(&self, name: &str, color: /*Ignored*/Option<&gdk::RGBA>);
fn override_symbolic_color(&self, name: &str, color: Option<&gdk::RGBA>);

#[cfg(feature = "v3_20")]
fn queue_allocate(&self);
Expand Down Expand Up @@ -1653,27 +1653,35 @@ impl<O: IsA<Widget> + IsA<Object>> WidgetExt for O {
}
}

//fn override_background_color(&self, state: StateFlags, color: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe { TODO: call ffi::gtk_widget_override_background_color() }
//}
fn override_background_color(&self, state: StateFlags, color: Option<&gdk::RGBA>) {
unsafe {
ffi::gtk_widget_override_background_color(self.to_glib_none().0, state.to_glib(), color.to_glib_none().0);
}
}

//fn override_color(&self, state: StateFlags, color: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe { TODO: call ffi::gtk_widget_override_color() }
//}
fn override_color(&self, state: StateFlags, color: Option<&gdk::RGBA>) {
unsafe {
ffi::gtk_widget_override_color(self.to_glib_none().0, state.to_glib(), color.to_glib_none().0);
}
}

//fn override_cursor(&self, cursor: /*Ignored*/Option<&gdk::RGBA>, secondary_cursor: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe { TODO: call ffi::gtk_widget_override_cursor() }
//}
fn override_cursor(&self, cursor: Option<&gdk::RGBA>, secondary_cursor: Option<&gdk::RGBA>) {
unsafe {
ffi::gtk_widget_override_cursor(self.to_glib_none().0, cursor.to_glib_none().0, secondary_cursor.to_glib_none().0);
}
}

fn override_font(&self, font_desc: Option<&pango::FontDescription>) {
unsafe {
ffi::gtk_widget_override_font(self.to_glib_none().0, font_desc.to_glib_none().0);
}
}

//fn override_symbolic_color(&self, name: &str, color: /*Ignored*/Option<&gdk::RGBA>) {
// unsafe { TODO: call ffi::gtk_widget_override_symbolic_color() }
//}
fn override_symbolic_color(&self, name: &str, color: Option<&gdk::RGBA>) {
unsafe {
ffi::gtk_widget_override_symbolic_color(self.to_glib_none().0, name.to_glib_none().0, color.to_glib_none().0);
}
}

#[cfg(feature = "v3_20")]
fn queue_allocate(&self) {
Expand Down
Loading