X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2246a3881e5c3293b70560dde099ee772c86d73..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk/control.cpp?ds=inline diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index 0191a2f919..ff33e9af47 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -20,10 +20,11 @@ #endif #include "wx/fontutil.h" -#include "wx/gtk/private.h" #include "wx/utils.h" #include "wx/sysopt.h" +#include +#include "wx/gtk/private.h" #include "wx/gtk/private/mnemonics.h" // ============================================================================ @@ -57,6 +58,21 @@ bool wxControl::Create( wxWindow *parent, return ret; } +#ifdef __WXGTK3__ +bool wxControl::SetFont(const wxFont& font) +{ + const bool changed = base_type::SetFont(font); + if (changed && !gtk_widget_get_realized(m_widget)) + { + // GTK defers sending "style-updated" until widget is realized, but + // GetBestSize() won't compute correct result until the signal is sent, + // so we have to do it now + g_signal_emit_by_name(m_widget, "style-updated"); + } + return changed; +} +#endif + wxSize wxControl::DoGetBestSize() const { // Do not return any arbitrary default value... @@ -70,11 +86,9 @@ wxSize wxControl::DoGetBestSize() const } else { - GtkRequisition req; - GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req); - best.Set(req.width, req.height); + best = GTKGetPreferredSize(m_widget); } - CacheBestSize(best); + return best; } @@ -82,12 +96,14 @@ void wxControl::PostCreation(const wxSize& size) { wxWindow::PostCreation(); +#ifndef __WXGTK3__ // NB: GetBestSize needs to know the style, otherwise it will assume // default font and if the user uses a different font, determined // best size will be different (typically, smaller) than the desired // size. This call ensure that a style is available at the time // GetBestSize is called. gtk_widget_ensure_style(m_widget); +#endif GTKApplyWidgetStyle(); SetInitialSize(size); @@ -99,22 +115,22 @@ void wxControl::PostCreation(const wxSize& size) // ---------------------------------------------------------------------------- // Fix sensitivity due to bug in GTK+ < 2.14 -void wxControl::GTKFixSensitivity(bool onlyIfUnderMouse) +void wxControl::GTKFixSensitivity(bool WXUNUSED_IN_GTK3(onlyIfUnderMouse)) { +#ifndef __WXGTK3__ if (gtk_check_version(2,14,0) #if wxUSE_SYSTEM_OPTIONS && (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1) #endif ) { - wxPoint pt = wxGetMousePosition(); - wxRect rect(ClientToScreen(wxPoint(0, 0)), GetSize()); - if (!onlyIfUnderMouse || rect.Contains(pt)) + if (!onlyIfUnderMouse || GetScreenRect().Contains(wxGetMousePosition())) { Hide(); Show(); } } +#endif } // ---------------------------------------------------------------------------- @@ -123,19 +139,19 @@ void wxControl::GTKFixSensitivity(bool onlyIfUnderMouse) void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label) { - // save the original label - wxControlBase::SetLabel(label); - const wxString labelGTK = GTKConvertMnemonics(label); gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK)); } +#if wxUSE_MARKUP + void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label) { const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label); gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK)); } +#endif // wxUSE_MARKUP // ---------------------------------------------------------------------------- // GtkFrame helpers @@ -160,14 +176,16 @@ GtkWidget* wxControl::GTKCreateFrame(const wxString& label) void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label) { + wxControlBase::SetLabel(label); + GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w)); GTKSetLabelForLabel(labelwidget, label); } void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style) { - gtk_widget_modify_style(GTK_WIDGET(w), style); - gtk_widget_modify_style(gtk_frame_get_label_widget (w), style); + GTKApplyStyle(GTK_WIDGET(w), style); + GTKApplyStyle(gtk_frame_get_label_widget(w), style); } void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget) @@ -212,11 +230,29 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const // static wxVisualAttributes wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, - bool useBase, + bool WXUNUSED_IN_GTK3(useBase), int state) { - GtkStyle* style; wxVisualAttributes attr; +#ifdef __WXGTK3__ + GtkStateFlags stateFlag = GTK_STATE_FLAG_NORMAL; + if (state) + { + wxASSERT(state == GTK_STATE_ACTIVE); + stateFlag = GTK_STATE_FLAG_ACTIVE; + } + GtkStyleContext* sc = gtk_widget_get_style_context(widget); + GdkRGBA c; + gtk_style_context_get_color(sc, stateFlag, &c); + attr.colFg = wxColour(c); + gtk_style_context_get_background_color(sc, stateFlag, &c); + attr.colBg = wxColour(c); + wxNativeFontInfo info; + info.description = const_cast(gtk_style_context_get_font(sc, stateFlag)); + attr.font = wxFont(info); + info.description = NULL; +#else + GtkStyle* style; style = gtk_rc_get_style(widget); if (!style) @@ -227,9 +263,6 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, return wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL); } - if (state == -1) - state = GTK_STATE_NORMAL; - // get the style's colours attr.colFg = wxColour(style->fg[state]); if (useBase) @@ -243,10 +276,12 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, if ( style && style->font_desc ) { wxNativeFontInfo info; - info.description = pango_font_description_copy(style->font_desc); + info.description = style->font_desc; attr.font = wxFont(info); + info.description = NULL; } - else +#endif + if (!attr.font.IsOk()) { GtkSettings *settings = gtk_settings_get_default(); gchar *font_name = NULL; @@ -314,17 +349,58 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new, return attr; } -// ---------------------------------------------------------------------------- -// idle handling -// ---------------------------------------------------------------------------- +// This is not the same as GetBestSize() because that size may have +// been recalculated and cached by us. We want GTK+ information. +wxSize wxControl::GTKGetPreferredSize(GtkWidget* widget) const +{ + GtkRequisition req; +#ifdef __WXGTK3__ + if (gtk_widget_get_request_mode(widget) != GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH) + { + gtk_widget_get_preferred_height(widget, NULL, &req.height); + gtk_widget_get_preferred_width_for_height(widget, req.height, NULL, &req.width); + } + else + { + gtk_widget_get_preferred_width(widget, NULL, &req.width); + gtk_widget_get_preferred_height_for_width(widget, req.width, NULL, &req.height); + } +#else + GTK_WIDGET_GET_CLASS(widget)->size_request(widget, &req); +#endif -void wxControl::OnInternalIdle() + return wxSize(req.width, req.height); +} + +wxPoint wxControl::GTKGetEntryMargins(GtkEntry* entry) const { - if ( GTKShowFromOnIdle() ) - return; + wxPoint marg(0, 0); - if ( wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen() ) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); +#ifndef __WXGTK3__ +#if GTK_CHECK_VERSION(2,10,0) + // The margins we have previously set + const GtkBorder* border = gtk_entry_get_inner_border(entry); + if ( border ) + { + marg.x = border->left + border->right; + marg.y = border->top + border->bottom; + } +#endif // GTK+ 2.10+ +#else // GTK+ 3 + // Gtk3 does not use inner border, but StyleContext and CSS + // TODO: implement it, starting with wxTextEntry::DoSetMargins() +#endif // GTK+ 2/3 + + int x, y; + gtk_entry_get_layout_offsets(entry, &x, &y); + // inner borders are included. Substract them so we can get other margins + x -= marg.x; + y -= marg.y; + marg.x += 2 * x + 2; + marg.y += 2 * y + 2; + + return marg; } + #endif // wxUSE_CONTROLS