steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui: Rename floating-window to dialog-window as per @bjourne's suggestion. Related to #1026.

db4
Doug Coleman 2014-08-05 10:03:17 -07:00
parent 0287355e2a
commit 68446b047b
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/ui/backend/cocoa/cocoa.factor
View File

@ -113,7 +113,7 @@ M: cocoa-ui-backend (fullscreen?) ( world -- ? )
handle>> view>> -> isInFullScreenMode zero? not ; handle>> view>> -> isInFullScreenMode zero? not ;
! XXX: Until someone tests OSX with a tiling window manager, ! 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 CONSTANT: window-control>styleMask
H{ H{
{ close-button $ NSClosableWindowMask } { close-button $ NSClosableWindowMask }
@ -123,7 +123,7 @@ CONSTANT: window-control>styleMask
{ small-title-bar $[ NSTitledWindowMask NSUtilityWindowMask bitor ] } { small-title-bar $[ NSTitledWindowMask NSUtilityWindowMask bitor ] }
{ textured-background $ NSTexturedBackgroundWindowMask } { textured-background $ NSTexturedBackgroundWindowMask }
{ normal-title-bar $ NSTitledWindowMask } { normal-title-bar $ NSTitledWindowMask }
{ floating-window $ NSTitledWindowMask } { dialog-window $ NSTitledWindowMask }
} }
: world>styleMask ( world -- n ) : world>styleMask ( world -- n )

6
basis/ui/backend/gtk/gtk.factor
View File

@ -361,7 +361,7 @@ CONSTANT: window-controls>decor-flags
{ small-title-bar $ GDK_DECOR_TITLE } { small-title-bar $ GDK_DECOR_TITLE }
{ normal-title-bar $ GDK_DECOR_TITLE } { normal-title-bar $ GDK_DECOR_TITLE }
{ textured-background 0 } { textured-background 0 }
{ floating-window 0 } { dialog-window 0 }
} }
CONSTANT: window-controls>func-flags CONSTANT: window-controls>func-flags
@ -373,12 +373,12 @@ CONSTANT: window-controls>func-flags
{ small-title-bar 0 } { small-title-bar 0 }
{ normal-title-bar 0 } { normal-title-bar 0 }
{ textured-background 0 } { textured-background 0 }
{ floating-window 0 } { dialog-window 0 }
} }
: set-window-hint ( win controls -- ) : 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 ] } { [ small-title-bar over member-eq? ] [ drop GDK_WINDOW_TYPE_HINT_UTILITY ] }
[ drop GDK_WINDOW_TYPE_HINT_NORMAL ] [ drop GDK_WINDOW_TYPE_HINT_NORMAL ]
} cond gtk_window_set_type_hint ; } cond gtk_window_set_type_hint ;

4
basis/ui/backend/windows/windows.factor
View File

@ -237,7 +237,7 @@ CONSTANT: window-control>style
{ resize-handles $ WS_THICKFRAME } { resize-handles $ WS_THICKFRAME }
{ small-title-bar $ WS_CAPTION } { small-title-bar $ WS_CAPTION }
{ normal-title-bar $ WS_CAPTION } { normal-title-bar $ WS_CAPTION }
{ floating-window 0 } { dialog-window 0 }
} }
CONSTANT: window-control>ex-style CONSTANT: window-control>ex-style
@ -249,7 +249,7 @@ CONSTANT: window-control>ex-style
{ resize-handles $ WS_EX_WINDOWEDGE } { resize-handles $ WS_EX_WINDOWEDGE }
{ small-title-bar $[ WS_EX_TOOLWINDOW WS_EX_TOPMOST bitor ] } { small-title-bar $[ WS_EX_TOOLWINDOW WS_EX_TOPMOST bitor ] }
{ normal-title-bar $ WS_EX_APPWINDOW } { normal-title-bar $ WS_EX_APPWINDOW }
{ floating-window 0 } { dialog-window 0 }
} }
: needs-sysmenu? ( controls -- ? ) : needs-sysmenu? ( controls -- ? )

2
basis/ui/gadgets/worlds/worlds.factor
View File

@ -16,7 +16,7 @@ SYMBOLS:
small-title-bar small-title-bar
normal-title-bar normal-title-bar
textured-background textured-background
floating-window ; dialog-window ;
CONSTANT: default-world-pixel-format-attributes CONSTANT: default-world-pixel-format-attributes
{ {

2
basis/ui/tools/browser/browser.factor
View File

@ -92,7 +92,7 @@ M: browser-gadget focusable-child* search-field>> ;
<browser-gadget> <browser-gadget>
<world-attributes> <world-attributes>
"Browser" >>title "Browser" >>title
[ { floating-window } append ] change-window-controls [ { dialog-window } append ] change-window-controls
open-status-window ; open-status-window ;
: browser-window ( -- ) : browser-window ( -- )

2
basis/ui/tools/deploy/deploy.factor
View File

@ -115,6 +115,6 @@ deploy-gadget "toolbar" f {
[ [
<world-attributes> <world-attributes>
swap "Deploying “" "”" surround >>title swap "Deploying “" "”" surround >>title
[ { floating-window } append ] change-window-controls [ { dialog-window } append ] change-window-controls
] bi ] bi
open-window ; open-window ;

2
basis/ui/tools/inspector/inspector.factor
View File

@ -105,7 +105,7 @@ M: inspector-gadget focusable-child*
[ [
<world-attributes> <world-attributes>
swap "Slot editor: " prepend >>title swap "Slot editor: " prepend >>title
[ { floating-window } append ] change-window-controls [ { dialog-window } append ] change-window-controls
] bi* ] bi*
open-status-window ; open-status-window ;

4
basis/ui/ui-docs.factor
View File

@ -333,7 +333,7 @@ HELP: normal-title-bar
HELP: textured-background 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." } ; { $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." } ; { $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: HELP: MAIN-WINDOW:
@ -360,6 +360,6 @@ ARTICLE: "ui.gadgets.worlds-window-controls" "Window controls"
small-title-bar small-title-bar
normal-title-bar normal-title-bar
textured-background 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 } "." ; "Provide a sequence of these values in the " { $snippet "window-controls" } " slot of the " { $link world-attributes } " tuple you pass to " { $link open-window } "." ;