suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk: fix menu-bar height handling to work right with Ubuntu's patch to support out-of-frame menu bars in Unity

Browse Source
This commit is contained in:
Matthew Flatt 2011-06-20 13:31:21 -06:00
parent 8990177c75
commit b4e3e065ac
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collects/mred/private/wx/gtk/frame.rkt
View File

@ -219,6 +219,9 @@
;; grow if it doesn't have to grow to accommodate the menu bar. ;; grow if it doesn't have to grow to accommodate the menu bar.
(send this resized)) (send this resized))
(define/public (reset-menu-height h)
(adjust-client-delta 0 h))
(define saved-enforcements (vector 0 0 -1 -1)) (define saved-enforcements (vector 0 0 -1 -1))
(define/public (enforce-size min-x min-y max-x max-y inc-x inc-y) (define/public (enforce-size min-x min-y max-x max-y inc-x inc-y)

38
collects/mred/private/wx/gtk/menu-bar.rkt
View File

@ -49,6 +49,13 @@
(lambda () (send frame on-menu-click)) (lambda () (send frame on-menu-click))
(void)))))))) (void))))))))
(define-signal-handler connect-ubuntu-local "notify::ubuntu-local"
(_fun _GtkWidget -> _void)
(lambda (gtk)
(let ([wx (gtk->wx gtk)])
(when wx
(send wx reset-menu-height)))))
(define top-menu% (define top-menu%
(class widget% (class widget%
(init-field parent) (init-field parent)
@ -82,6 +89,12 @@
(connect-menu-key-press gtk) (connect-menu-key-press gtk)
(connect-menu-button-press gtk) (connect-menu-button-press gtk)
;; Ubuntu patches Gtk so that a menu bar starts
;; as "remote" instead of appearing in a frame.
;; For configurations that put the menu bar in a frame,
;; the "notify::ubuntu-local" signal is issued.
(connect-ubuntu-local gtk)
; (gtk_menu_set_accel_group gtk the-accelerator-group) ; (gtk_menu_set_accel_group gtk the-accelerator-group)
(define top-wx #f) (define top-wx #f)
@ -89,19 +102,28 @@
(define/public (set-top-window top) (define/public (set-top-window top)
(set! top-wx top) (set! top-wx top)
(install-widget-parent top) (install-widget-parent top)
;; return initial size; also, add a menu to make sure there is one, (fix-menu-height))
(define/public (reset-menu-height)
(when top-wx
(send top-wx reset-menu-height (fix-menu-height))))
(define/private (fix-menu-height)
;; a menu to make sure there is one,
;; and force the menu bar to be at least that tall always ;; and force the menu bar to be at least that tall always
(atomically (atomically
(define item (gtk_menu_item_new_with_mnemonic "Xyz")) (define item
(gtk_menu_shell_append gtk item) (and (null? menus)
(gtk_widget_show item) (gtk_menu_item_new_with_mnemonic "Xyz")))
(when item
(gtk_menu_shell_append gtk item)
(gtk_widget_show item))
(define req (make-GtkRequisition 0 0)) (define req (make-GtkRequisition 0 0))
(gtk_widget_size_request item req)
(define item-height (GtkRequisition-height req))
(gtk_widget_size_request gtk req) (gtk_widget_size_request gtk req)
(define height (max (GtkRequisition-height req) item-height)) (define height (GtkRequisition-height req))
(gtk_widget_set_usize gtk -1 height) (gtk_widget_set_usize gtk -1 height)
(gtk_container_remove gtk item) (when item
(gtk_container_remove gtk item))
height)) height))
(define/public (get-top-window) (define/public (get-top-window)