From 68446b047b20187498a728e2a82da70285a86921 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 5 Aug 2014 10:03:17 -0700 Subject: [PATCH] ui: Rename floating-window to dialog-window as per @bjourne's suggestion. Related to #1026. --- basis/ui/backend/cocoa/cocoa.factor | 4 ++-- basis/ui/backend/gtk/gtk.factor | 6 +++--- basis/ui/backend/windows/windows.factor | 4 ++-- basis/ui/gadgets/worlds/worlds.factor | 2 +- basis/ui/tools/browser/browser.factor | 2 +- basis/ui/tools/deploy/deploy.factor | 2 +- basis/ui/tools/inspector/inspector.factor | 2 +- basis/ui/ui-docs.factor | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/basis/ui/backend/cocoa/cocoa.factor b/basis/ui/backend/cocoa/cocoa.factor index a5d6a3a4ef..9674a72892 100644 --- a/basis/ui/backend/cocoa/cocoa.factor +++ b/basis/ui/backend/cocoa/cocoa.factor @@ -113,7 +113,7 @@ M: cocoa-ui-backend (fullscreen?) ( world -- ? ) handle>> view>> -> isInFullScreenMode zero? not ; ! XXX: Until someone tests OSX with a tiling window manager, -! floating-window is the same as normal-title-window +! dialog-window is the same as normal-title-window CONSTANT: window-control>styleMask H{ { close-button $ NSClosableWindowMask } @@ -123,7 +123,7 @@ CONSTANT: window-control>styleMask { small-title-bar $[ NSTitledWindowMask NSUtilityWindowMask bitor ] } { textured-background $ NSTexturedBackgroundWindowMask } { normal-title-bar $ NSTitledWindowMask } - { floating-window $ NSTitledWindowMask } + { dialog-window $ NSTitledWindowMask } } : world>styleMask ( world -- n ) diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor index ed0a45ee6a..ff5502eede 100644 --- a/basis/ui/backend/gtk/gtk.factor +++ b/basis/ui/backend/gtk/gtk.factor @@ -361,7 +361,7 @@ CONSTANT: window-controls>decor-flags { small-title-bar $ GDK_DECOR_TITLE } { normal-title-bar $ GDK_DECOR_TITLE } { textured-background 0 } - { floating-window 0 } + { dialog-window 0 } } CONSTANT: window-controls>func-flags @@ -373,12 +373,12 @@ CONSTANT: window-controls>func-flags { small-title-bar 0 } { normal-title-bar 0 } { textured-background 0 } - { floating-window 0 } + { dialog-window 0 } } : set-window-hint ( win controls -- ) { - { [ floating-window over member-eq? ] [ drop GDK_WINDOW_TYPE_HINT_DIALOG ] } + { [ dialog-window over member-eq? ] [ drop GDK_WINDOW_TYPE_HINT_DIALOG ] } { [ small-title-bar over member-eq? ] [ drop GDK_WINDOW_TYPE_HINT_UTILITY ] } [ drop GDK_WINDOW_TYPE_HINT_NORMAL ] } cond gtk_window_set_type_hint ; diff --git a/basis/ui/backend/windows/windows.factor b/basis/ui/backend/windows/windows.factor index 926e720e69..563ab5e44d 100755 --- a/basis/ui/backend/windows/windows.factor +++ b/basis/ui/backend/windows/windows.factor @@ -237,7 +237,7 @@ CONSTANT: window-control>style { resize-handles $ WS_THICKFRAME } { small-title-bar $ WS_CAPTION } { normal-title-bar $ WS_CAPTION } - { floating-window 0 } + { dialog-window 0 } } CONSTANT: window-control>ex-style @@ -249,7 +249,7 @@ CONSTANT: window-control>ex-style { resize-handles $ WS_EX_WINDOWEDGE } { small-title-bar $[ WS_EX_TOOLWINDOW WS_EX_TOPMOST bitor ] } { normal-title-bar $ WS_EX_APPWINDOW } - { floating-window 0 } + { dialog-window 0 } } : needs-sysmenu? ( controls -- ? ) diff --git a/basis/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor index 2644240bd7..72eaba9647 100644 --- a/basis/ui/gadgets/worlds/worlds.factor +++ b/basis/ui/gadgets/worlds/worlds.factor @@ -16,7 +16,7 @@ SYMBOLS: small-title-bar normal-title-bar textured-background - floating-window ; + dialog-window ; CONSTANT: default-world-pixel-format-attributes { diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index b9002dfd9e..f5930781c6 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -92,7 +92,7 @@ M: browser-gadget focusable-child* search-field>> ; "Browser" >>title - [ { floating-window } append ] change-window-controls + [ { dialog-window } append ] change-window-controls open-status-window ; : browser-window ( -- ) diff --git a/basis/ui/tools/deploy/deploy.factor b/basis/ui/tools/deploy/deploy.factor index 6e89d8787e..557a87b944 100644 --- a/basis/ui/tools/deploy/deploy.factor +++ b/basis/ui/tools/deploy/deploy.factor @@ -115,6 +115,6 @@ deploy-gadget "toolbar" f { [ swap "Deploying “" "”" surround >>title - [ { floating-window } append ] change-window-controls + [ { dialog-window } append ] change-window-controls ] bi open-window ; diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index 53d2ca4ccb..2f27755483 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/basis/ui/tools/inspector/inspector.factor @@ -105,7 +105,7 @@ M: inspector-gadget focusable-child* [ swap "Slot editor: " prepend >>title - [ { floating-window } append ] change-window-controls + [ { dialog-window } append ] change-window-controls ] bi* open-status-window ; diff --git a/basis/ui/ui-docs.factor b/basis/ui/ui-docs.factor index 69e359711f..7246ad6ca8 100644 --- a/basis/ui/ui-docs.factor +++ b/basis/ui/ui-docs.factor @@ -333,7 +333,7 @@ HELP: normal-title-bar HELP: textured-background { $description "Asks for a window to have a background that blends seamlessly with the window frame. Factor will leave the window background transparent and pass mouse button gestures not handled directly by a gadget through to the window system so that the window can be dragged from anywhere on its background." } ; -HELP: floating-window +HELP: dialog-window { $description "Provides a hint to the window manager to create a floating, dialog-style window. Currently, this is only implemented for the GTK backend." } ; HELP: MAIN-WINDOW: @@ -360,6 +360,6 @@ ARTICLE: "ui.gadgets.worlds-window-controls" "Window controls" small-title-bar normal-title-bar textured-background - floating-window + dialog-window } "Provide a sequence of these values in the " { $snippet "window-controls" } " slot of the " { $link world-attributes } " tuple you pass to " { $link open-window } "." ;