diff --git a/Graphics/UI/Gtk/Entry/Entry.chs b/Graphics/UI/Gtk/Entry/Entry.chs --- a/Graphics/UI/Gtk/Entry/Entry.chs +++ b/Graphics/UI/Gtk/Entry/Entry.chs @@ -77,6 +77,10 @@ entrySetHasFrame, entryGetWidthChars, entrySetWidthChars, +#if GTK_CHECK_VERSION(3,2,0) + entrySetPlaceholderText, + entryGetPlaceholderText, +#endif #if GTK_CHECK_VERSION(2,4,0) entrySetAlignment, entryGetAlignment, @@ -110,6 +114,9 @@ entryWidthChars, entryScrollOffset, entryText, +#if GTK_CHECK_VERSION(3,2,0) + entryPlaceholderText, +#endif #if GTK_CHECK_VERSION(2,4,0) entryXalign, entryAlignment, @@ -430,6 +437,38 @@ (toEntry self) (fromIntegral nChars) +#if GTK_CHECK_VERSION(3,2,0) +-- | Sets text to be displayed in entry when it is empty and unfocused. +-- This can be used to give a visual hint of the expected contents of the `Entry`. +-- +-- Note that since the placeholder text gets removed when the entry received +-- focus, using this feature is a bit problematic if the entry is given the +-- initial focus in a window. Sometimes this can be worked around by delaying +-- the initial focus setting until the first key event arrives. +-- +-- * Available since Gtk version 3.2 +-- +entrySetPlaceholderText :: (EntryClass self, GlibString text) => self + -> Maybe text -- ^ @text@ a string to be displayed when entry is empty an unfocused, or `Nothing` + -> IO () +entrySetPlaceholderText self text = + maybeWith withUTFString text $ \ textPtr -> + {# call entry_set_placeholder_text #} + (toEntry self) + textPtr + +-- | Retrieves the text that will be displayed when entry is empty and unfocused. +-- +-- * Available since Gtk version 3.2 +-- +entryGetPlaceholderText :: (EntryClass self, GlibString text) => self + -> IO (Maybe text) -- ^ returns placeholder text +entryGetPlaceholderText self = + {# call unsafe entry_get_placeholder_text #} + (toEntry self) + >>= maybePeek peekUTFString +#endif + #if GTK_CHECK_VERSION(2,4,0) -- | Sets the alignment for the contents of the entry. This controls the -- horizontal positioning of the contents when the displayed text is shorter @@ -652,6 +691,17 @@ entryText = newAttr entryGetText entrySetText + +#if GTK_CHECK_VERSION(3,2,0) +-- | The text that will be displayed in the `Entry` when it is empty and unfocused. +-- +-- Default value: Nothing +-- +entryPlaceholderText :: (EntryClass self, GlibString text) => Attr self (Maybe text) +entryPlaceholderText = newAttr + entryGetPlaceholderText + entrySetPlaceholderText +#endif #if GTK_CHECK_VERSION(2,4,0) -- | The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL diff --git a/gtk3.cabal b/gtk3.cabal --- a/gtk3.cabal +++ b/gtk3.cabal @@ -1,5 +1,5 @@ Name: gtk3 -Version: 0.14.0 +Version: 0.14.1 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -391,7 +391,7 @@ main-is: ActionMenu.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers, text + build-depends: gtk3==0.14.1, base, transformers, text Executable gtk2hs-demo-buttonBox default-language: Haskell98 @@ -399,7 +399,7 @@ main-is: ButtonBox.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers + build-depends: gtk3==0.14.1, base, transformers Executable gtk2hs-demo-carsim default-language: Haskell98 @@ -407,7 +407,7 @@ main-is: CarSim.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers, time, cairo + build-depends: gtk3==0.14.1, base, transformers, time, cairo Executable gtk2hs-demo-progress default-language: Haskell98 @@ -415,7 +415,7 @@ main-is: Progress.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers + build-depends: gtk3==0.14.1, base, transformers Executable gtk2hs-demo-progressThreadedRTS default-language: Haskell98 @@ -423,7 +423,7 @@ main-is: ProgressThreadedRTS.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers + build-depends: gtk3==0.14.1, base, transformers ghc-options: -threaded Executable gtk2hs-demo-fastDraw @@ -432,7 +432,7 @@ main-is: FastDraw.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers, array, cairo + build-depends: gtk3==0.14.1, base, transformers, array, cairo Executable gtk2hs-demo-fonts default-language: Haskell98 @@ -440,7 +440,7 @@ main-is: Fonts.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base + build-depends: gtk3==0.14.1, base Executable gtk2hs-demo-builder default-language: Haskell98 @@ -448,7 +448,7 @@ main-is: GtkBuilderTest.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers + build-depends: gtk3==0.14.1, base, transformers Executable gtk2hs-demo-helloworld default-language: Haskell98 @@ -456,7 +456,7 @@ main-is: World.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers + build-depends: gtk3==0.14.1, base, transformers Executable gtk2hs-demo-layout default-language: Haskell98 @@ -464,7 +464,7 @@ main-is: Layout.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers, cairo, text + build-depends: gtk3==0.14.1, base, transformers, cairo, text Executable gtk2hs-demo-menudemo default-language: Haskell98 @@ -472,7 +472,7 @@ main-is: MenuDemo.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers, text + build-depends: gtk3==0.14.1, base, transformers, text Executable gtk2hs-demo-combodemo default-language: Haskell98 @@ -480,7 +480,7 @@ main-is: ComboDemo.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, text, base, transformers + build-depends: gtk3==0.14.1, text, base, transformers Executable gtk2hs-demo-notebook default-language: Haskell98 @@ -488,7 +488,7 @@ main-is: Notebook.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers, text + build-depends: gtk3==0.14.1, base, transformers, text Executable gtk2hs-demo-statusIcon default-language: Haskell98 @@ -496,7 +496,7 @@ main-is: StatusIcon.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers + build-depends: gtk3==0.14.1, base, transformers Executable gtk2hs-demo-arabic default-language: Haskell98 @@ -504,7 +504,7 @@ main-is: Arabic.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers, text + build-depends: gtk3==0.14.1, base, transformers, text Executable gtk2hs-demo-overlay default-language: Haskell98 @@ -512,4 +512,4 @@ main-is: Overlay.hs if !flag(build-demos) buildable: False - build-depends: gtk3==0.14.0, base, transformers + build-depends: gtk3==0.14.1, base, transformers