Update code for objects

Update Tomo API to v0.41.0
Update code for layouts, objects
2024-07-25 12:58:38 -04:00 · 2024-07-25 12:55:03 -04:00 · 2024-07-21 11:48:28 -04:00 · 2024-07-21 11:48:06 -04:00 · 2024-06-27 14:09:58 -04:00 · 2024-06-27 14:01:14 -04:00
33 changed files with 3565 additions and 412 deletions
--- a/674
+++ b/674
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 # objects

+[![Go Reference](https://pkg.go.dev/badge/git.tebibyte.media/tomo/objects.svg)](https://pkg.go.dev/git.tebibyte.media/tomo/objects)
+
 Objects contains a standard collection of re-usable objects. All objects in this
 module visually conform to whatever the theme is set to.
--- a/button.go
+++ b/button.go
@@ -1,13 +1,22 @@
 package objects

 import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/tomo/theme"
 import "git.tebibyte.media/tomo/tomo/input"
 import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+var buttonLayout     = layouts.Row { true        }
+var iconButtonLayout = layouts.Row { true        }
+var bothButtonLayout = layouts.Row { false, true }

 // Button is a clickable button.
 type Button struct {
-	tomo.TextBox
+	tomo.ContainerBox
+
+	label *Label
+	icon  *Icon
+	labelActive bool
+	
 	on struct {
 		click event.FuncBroadcaster
 	}
@@ -15,29 +24,89 @@ type Button struct {

 // NewButton creates a new button with the specified text.
 func NewButton (text string) *Button {
-	box := &Button { TextBox: tomo.NewTextBox() }
-	theme.Apply(box, theme.R("objects", "Button", ""))
+	box := &Button {
+		ContainerBox: tomo.NewContainerBox(),
+		label:        NewLabel(text),
+	}
+	box.SetRole(tomo.R("objects", "Button"))
+	box.label.SetAttr(tomo.AAlign(tomo.AlignMiddle, tomo.AlignMiddle))
+	box.SetAttr(tomo.ALayout(buttonLayout))
 	box.SetText(text)
-	box.SetAlign(tomo.AlignMiddle, tomo.AlignMiddle)
-	box.OnMouseUp(box.handleMouseUp)
+	
+	box.SetInputMask(true)
+	box.OnButtonDown(box.handleButtonDown)
+	box.OnButtonUp(box.handleButtonUp)
+	box.OnKeyDown(box.handleKeyDown)
 	box.OnKeyUp(box.handleKeyUp)
 	box.SetFocusable(true)
 	return box
 }

+// SetText sets the text of the button's label.
+func (this *Button) SetText (text string) {
+	this.label.SetText(text)
+	if this.labelActive && text == "" {
+		this.Remove(this.label)
+		this.labelActive = false
+	}
+	if !this.labelActive && text != "" {
+		this.Add(this.label)
+		this.labelActive = true
+	}
+	this.applyLayout()
+}
+
+// SetIcon sets an icon for this button. Setting the icon to IconUnknown will
+// remove it.
+func (this *Button) SetIcon (id tomo.Icon) {
+	if this.icon != nil { this.Remove(this.icon) }
+
+	var icon *Icon; if id != tomo.IconUnknown {
+		icon = NewIcon(id, tomo.IconSizeSmall)
+	}
+	this.icon = icon
+
+	if this.icon != nil {
+		this.Insert(this.icon, this.label)
+	}
+	this.applyLayout()
+}
+
 // OnClick specifies a function to be called when the button is clicked.
 func (this *Button) OnClick (callback func ()) event.Cookie {
 	return this.on.click.Connect(callback)
 }

-func (this *Button) handleKeyUp (key input.Key, numberPad bool) {
-	if key != input.KeyEnter && key != input.Key(' ') { return }
-	this.on.click.Broadcast()
-}
-
-func (this *Button) handleMouseUp (button input.Button) {
-	if button != input.ButtonLeft { return }
-	if this.MousePosition().In(this.Bounds()) {
-		this.on.click.Broadcast()
+func (this *Button) applyLayout () {
+	if this.labelActive && this.icon == nil {
+		this.SetAttr(tomo.ALayout(buttonLayout))
+	} else if !this.labelActive && this.icon != nil {
+		this.SetAttr(tomo.ALayout(iconButtonLayout))
+	} else {
+		this.SetAttr(tomo.ALayout(bothButtonLayout))
 	}
 }
+
+func (this *Button) handleKeyDown (key input.Key, numberPad bool) bool {
+	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	return true
+}
+
+func (this *Button) handleKeyUp (key input.Key, numberPad bool) bool {
+	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	this.on.click.Broadcast()
+	return true
+}
+
+func (this *Button) handleButtonDown (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	return true
+}
+
+func (this *Button) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	if this.Window().MousePosition().In(this.Bounds()) {
+		this.on.click.Broadcast()
+	}
+	return true
+}
--- a/calendar.go
+++ b/calendar.go
@@ -0,0 +1,173 @@
+package objects
+
+import "fmt"
+import "time"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// Calendar is an object that can display a date and allow the user to change
+// it. It can display one month at a time.
+type Calendar struct {
+	tomo.ContainerBox
+	
+	grid tomo.ContainerBox
+	time time.Time
+	monthLabel *Label
+	
+	on struct {
+		valueChange event.FuncBroadcaster
+	}
+}
+
+// NewCalendar creates a new calendar with the specified date.
+func NewCalendar (tm time.Time) *Calendar {
+	calendar := &Calendar {
+		ContainerBox: tomo.NewContainerBox(),
+		time:         tm,
+	}
+	calendar.SetRole(tomo.R("objects", "Calendar"))
+	calendar.SetAttr(tomo.ALayout(layouts.ContractVertical))
+	
+	prevButton := NewButton("")
+	prevButton.SetIcon(tomo.IconGoPrevious)
+	prevButton.OnClick(func () {
+		calendar.prevMonth()
+		calendar.on.valueChange.Broadcast()
+	})
+	nextButton := NewButton("")
+	nextButton.SetIcon(tomo.IconGoNext)
+	nextButton.OnClick(func () {
+		calendar.nextMonth()
+		calendar.on.valueChange.Broadcast()
+	})
+	calendar.monthLabel = NewLabel("")
+	calendar.monthLabel.SetAttr(tomo.AAlign(tomo.AlignMiddle, tomo.AlignMiddle))
+	
+	calendar.grid = tomo.NewContainerBox()
+	calendar.grid.SetRole(tomo.R("objects", "CalendarGrid"))
+	calendar.grid.SetAttr(tomo.ALayout(layouts.NewGrid (
+		true, true, true, true, true, true, true)()))
+	calendar.Add(NewInnerContainer (
+		layouts.Row { false, true, false },
+		prevButton, calendar.monthLabel, nextButton))
+	calendar.Add(calendar.grid)
+	
+	calendar.OnScroll(calendar.handleScroll)
+	
+	calendar.refresh()
+	return calendar
+}
+
+// Value returns the time this calendar is displaying.
+func (this *Calendar) Value () time.Time {
+	return this.time
+}
+
+// SetValue sets the date the calendar will display.
+func (this *Calendar) SetValue (tm time.Time) {
+	if this.time == tm { return }
+	this.time = tm
+	this.refresh()
+}
+
+// OnValueChange sets a function to be called when the user changes the date on
+// the calendar.
+func (this *Calendar) OnValueChange (callback func ()) {
+	this.on.valueChange.Connect(callback)
+}
+
+func (this *Calendar) prevMonth () {
+	this.time = firstOfMonth(this.time.Add(24 * time.Hour * -20))
+	this.refresh()
+}
+
+func (this *Calendar) nextMonth () {
+	this.time = firstOfMonth(this.time.Add(24 * time.Hour * 40))
+	this.refresh()
+}
+
+var weekdayAbbreviations = []string {
+	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+}
+
+func (this *Calendar) refresh () {
+	this.monthLabel.SetText(this.time.Format("2006 January"))
+
+	this.grid.Clear()
+	for _, day := range weekdayAbbreviations {
+		dayLabel := tomo.NewTextBox()
+		dayLabel.SetRole(tomo.R("objects", "CalendarWeekdayHeader"))
+		dayLabel.SetText(day)
+		dayLabel.SetAttr(tomo.AAlign(tomo.AlignMiddle, tomo.AlignMiddle))
+		this.grid.Add(dayLabel)
+	}
+	
+	dayIter := 0 - int(firstOfMonth(this.time).Weekday())
+	if dayIter <= -6 {
+		dayIter = 1
+	}
+	weekday := 0
+	totalDays := daysInMonth(this.time)
+	for ; dayIter <= totalDays; dayIter ++ {
+		weekday = (weekday + 1) % 7
+		if dayIter > 0 {
+			day := tomo.NewTextBox()
+			day.SetText(fmt.Sprint(dayIter))
+			if weekday == 1 || weekday == 0 {
+				day.SetRole(tomo.R("objects", "CalendarDay"))
+				day.SetTag("weekend", true)
+			} else {
+				day.SetRole(tomo.R("objects", "CalendarDay"))
+				day.SetTag("weekday", true)
+			}
+			this.grid.Add(day)
+		} else {
+			this.grid.Add(tomo.NewBox())
+		}
+	}
+}
+
+func (this *Calendar) handleScroll (x, y float64) bool {
+	if y < 0 {
+		this.prevMonth()
+	} else {
+		this.nextMonth()
+	}
+	return true
+}
+
+func firstOfMonth (tm time.Time) time.Time {
+	return time.Date(tm.Year(), tm.Month(), 0, 0, 0, 0, 0, time.Local)
+}
+
+func daysInMonth (tm time.Time) (days int) {
+	year  := tm.Year()
+	month := tm.Month()
+	switch month {
+	case 1:  days = 31
+	case 2:
+		// betcha didn't know this about leap years
+		if year % 4 == 0 && (year % 100 != 0 || year % 400 == 0) {
+			days = 29
+		} else {
+			days = 28
+		}
+	case 3:  days = 31
+	case 4:  days = 30
+	case 5:  days = 31
+	case 6:  days = 30
+	case 7:  days = 31
+	case 8:  days = 31
+	case 9:  days = 30
+	case 10: days = 31
+	case 11: days = 30
+	case 12: days = 31
+	}
+
+	return
+}
+
+func canonMonth (tm time.Time) int {
+	return int(tm.Month() - 1) + tm.Year() * 12
+}
--- a/checkbox.go
+++ b/checkbox.go
@@ -0,0 +1,78 @@
+package objects
+
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+
+// Checkbox is a control that can be toggled.
+type Checkbox struct {
+	tomo.Box
+	value bool
+	on struct {
+		valueChange event.FuncBroadcaster
+	}
+}
+
+// NewCheckbox creates a new checkbox with the specified value.
+func NewCheckbox (value bool) *Checkbox {
+	box := &Checkbox {
+		Box: tomo.NewBox(),
+	}
+	box.SetRole(tomo.R("objects", "Checkbox"))
+	box.SetValue(value)
+	
+	box.OnButtonDown(box.handleButtonDown)
+	box.OnButtonUp(box.handleButtonUp)
+	box.OnKeyDown(box.handleKeyDown)
+	box.OnKeyUp(box.handleKeyUp)
+	box.SetFocusable(true)
+	return box
+}
+
+// Value returns the value of the checkbox.
+func (this *Checkbox) Value () bool {
+	return this.value
+}
+
+// SetValue sets the value of the checkbox.
+func (this *Checkbox) SetValue (value bool) {
+	this.value = value
+	// the theme shall decide what checked and unchecked states look like
+	this.SetTag("checked",    value)
+	this.SetTag("unchecked", !value)
+}
+
+// Toggle toggles the value of the checkbox between true and false.
+func (this *Checkbox) Toggle () {
+	this.SetValue(!this.Value())
+}
+
+// OnValueChange specifies a function to be called when the user checks or
+// unchecks the checkbox.
+func (this *Checkbox) OnValueChange (callback func ()) event.Cookie {
+	return this.on.valueChange.Connect(callback)
+}
+
+func (this *Checkbox) handleKeyDown (key input.Key, numberPad bool) bool {
+	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	this.Toggle()
+	return true
+}
+
+func (this *Checkbox) handleKeyUp (key input.Key, numberPad bool) bool {
+	if key != input.KeyEnter && key != input.Key(' ') { return false}
+	return true
+}
+
+func (this *Checkbox) handleButtonDown (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	return true
+}
+
+func (this *Checkbox) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	if this.Window().MousePosition().In(this.Bounds()) {
+		this.Toggle()
+	}
+	return true
+}
--- a/colorpicker.go
+++ b/colorpicker.go
@@ -0,0 +1,159 @@
+package objects
+
+import "image/color"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/tomo/canvas"
+import "git.tebibyte.media/tomo/objects/layouts"
+import "git.tebibyte.media/tomo/objects/internal"
+
+// ColorPicker allows the user to pick a color by controlling its HSBA
+// parameters.
+type ColorPicker struct {
+	tomo.ContainerBox
+	value internal.HSVA
+	
+	pickerMap   *colorPickerMap
+	hueSlider   *Slider
+	alphaSlider *Slider
+	
+	on struct {
+		valueChange event.FuncBroadcaster
+	}
+}
+
+// NewColorPicker creates a new color picker with the specified color.
+func NewColorPicker (value color.Color) *ColorPicker {
+	picker := &ColorPicker {
+		ContainerBox: tomo.NewContainerBox(),
+	}
+	picker.SetRole(tomo.R("objects", "ColorPicker"))
+	picker.SetAttr(tomo.ALayout(layouts.Row { true, false, false }))
+	picker.pickerMap = newColorPickerMap(picker)
+	picker.Add(picker.pickerMap)
+	
+	picker.hueSlider = NewVerticalSlider(0.0)
+	picker.Add(picker.hueSlider)
+	picker.hueSlider.OnValueChange(func () {
+		picker.value.H = picker.hueSlider.Value()
+		picker.on.valueChange.Broadcast()
+		picker.pickerMap.Invalidate()
+	})
+	
+	picker.alphaSlider = NewVerticalSlider(0.0)
+	picker.Add(picker.alphaSlider)
+	picker.alphaSlider.OnValueChange(func () {
+		picker.value.A = uint8(picker.alphaSlider.Value() * 255)
+		picker.on.valueChange.Broadcast()
+		picker.pickerMap.Invalidate()
+	})
+	
+	if value == nil { value = color.Transparent }
+	picker.SetValue(value)
+	return picker
+}
+
+// Value returns the color of the picker.
+func (this *ColorPicker) Value () color.Color {
+	return this.value
+}
+
+// SetValue sets the color of the picker.
+func (this *ColorPicker) SetValue (value color.Color) {
+	if value == nil { value = color.Transparent }
+	this.value = internal.RGBAToHSVA(value.RGBA())
+	this.hueSlider.SetValue(this.value.H)
+	this.alphaSlider.SetValue(float64(this.value.A) / 255)
+}
+
+// OnValueChange specifies a function to be called when the user changes the
+// swatch's color.
+func (this *ColorPicker) OnValueChange (callback func ()) event.Cookie {
+	return this.on.valueChange.Connect(callback)
+}
+
+// RGBA satisfies the color.Color interface
+func (this *ColorPicker) RGBA () (r, g, b, a uint32) {
+	return this.value.RGBA()
+}
+
+type colorPickerMap struct {
+	tomo.CanvasBox
+	dragging bool
+	parent *ColorPicker
+}
+
+func newColorPickerMap (parent *ColorPicker) *colorPickerMap {
+	picker := &colorPickerMap {
+		CanvasBox: tomo.NewCanvasBox(),
+		parent: parent,
+	}
+	picker.SetDrawer(picker)
+	picker.SetRole(tomo.R("objects", "ColorPickerMap"))
+	picker.OnButtonUp(picker.handleButtonUp)
+	picker.OnButtonDown(picker.handleButtonDown)
+	picker.OnMouseMove(picker.handleMouseMove)
+	return picker
+}
+
+func (this *colorPickerMap) handleButtonDown (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	this.dragging = true
+	this.drag()
+	return true
+}
+
+func (this *colorPickerMap) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	this.dragging = false
+	return true
+}
+
+func (this *colorPickerMap) handleMouseMove () bool {
+	if !this.dragging { return false }
+	this.drag()
+	return true
+}
+
+func (this *colorPickerMap) drag () {
+	pointer := this.Window().MousePosition()
+	bounds  := this.InnerBounds()
+	this.parent.value.S =     float64(pointer.X - bounds.Min.X) / float64(bounds.Dx())
+	this.parent.value.V = 1 - float64(pointer.Y - bounds.Min.Y) / float64(bounds.Dy())
+	this.parent.value = this.parent.value.Canon()
+	this.parent.on.valueChange.Broadcast()
+	this.Invalidate()
+}
+
+func (this *colorPickerMap) Draw (can canvas.Canvas) {
+	bounds := can.Bounds()
+	for y := bounds.Min.Y; y < bounds.Max.Y; y ++ {
+	for x := bounds.Min.X; x < bounds.Max.X; x ++ {
+		xx := x - bounds.Min.X
+		yy := y - bounds.Min.Y
+		
+		pixel := internal.HSVA {
+			H: this.parent.value.H,
+			S:     float64(xx) / float64(bounds.Dx()),
+			V: 1 - float64(yy) / float64(bounds.Dy()),
+			A: 255,
+		}
+		
+		sPos := int(     this.parent.value.S  * float64(bounds.Dx()))
+		vPos := int((1 - this.parent.value.V) * float64(bounds.Dy()))
+		sDist := sPos - xx
+		vDist := vPos - yy
+		crosshair :=
+			(sDist == 0 || vDist == 0) &&
+			-8 < sDist && sDist < 8 &&
+			-8 < vDist && vDist < 8
+		if crosshair {
+			pixel.S = 1 - pixel.S
+			pixel.V = 1 - pixel.V
+		}
+		
+		can.Set(x, y, pixel)
+	}}
+}
+
--- a/container.go
+++ b/container.go
@@ -1,7 +1,6 @@
 package objects

 import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/tomo/theme"

 // Container is an object that can contain other objects. It can be used as a
 // primitive for building more complex layouts. It has two variants: an outer
@@ -16,24 +15,37 @@ func newContainer (layout tomo.Layout, children ...tomo.Object) *Container {
 	this := &Container {
 		ContainerBox: tomo.NewContainerBox(),
 	}
-	this.SetLayout(layout)
+	this.SetAttr(tomo.ALayout(layout))
 	for _, child := range children {
 		this.Add(child)
 	}
 	return this
 }

-// NewOuterContainer creates a new container that has padding around it.
+// NewOuterContainer creates a new container that has padding around it, as well
+// as a solid background color. It is meant to be used as a root container for a
+// window, tab pane, etc.
 func NewOuterContainer (layout tomo.Layout, children ...tomo.Object) *Container {
 	this := newContainer(layout, children...)
-	theme.Apply(this, theme.R("objects", "Container", "outer"))
+	this.SetRole(tomo.R("objects", "Container"))
+	this.SetTag("outer", true)
+	return this
+}
+
+// NewSunkenContainer creates a new container with a sunken style and padding
+// around it. It is meant to be used as a root container for a ScrollContainer.
+func NewSunkenContainer (layout tomo.Layout, children ...tomo.Object) *Container {
+	this := newContainer(layout, children...)
+	this.SetRole(tomo.R("objects", "Container"))
+	this.SetTag("sunken", true)
 	return this
 }

 // NewInnerContainer creates a new container that has no padding around it.
 func NewInnerContainer (layout tomo.Layout, children ...tomo.Object) *Container {
 	this := newContainer(layout, children...)
-	theme.Apply(this, theme.R("objects", "Container", "inner"))
+	this.SetRole(tomo.R("objects", "Container"))
+	this.SetTag("inner", true)
 	return this
 }

--- a/dialog.go
+++ b/dialog.go
@@ -0,0 +1,100 @@
+package objects
+
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// DialogKind defines the semantic role of a dialog window.
+type DialogKind int; const (
+	DialogInformation DialogKind = iota
+	DialogQuestion
+	DialogWarning
+	DialogError
+)
+
+// Dialog is a modal dialog window.
+type Dialog struct {
+	tomo.Window
+	controlRow tomo.ContainerBox
+}
+
+type clickable interface {
+	OnClick (func ()) event.Cookie
+}
+
+// NewDialog creates a new dialog window given a dialog kind.
+func NewDialog (kind DialogKind, parent tomo.Window, title, message string, options ...tomo.Object) (*Dialog, error) {
+	if title == "" {
+		switch kind {
+		case DialogInformation: title = "Information"
+		case DialogQuestion:    title = "Question"
+		case DialogWarning:     title = "Warning"
+		case DialogError:       title = "Error"
+		}
+	}
+
+	dialog := &Dialog { }
+	if parent == nil {
+		window, err := tomo.NewWindow(image.Rectangle { })
+		if err != nil { return nil, err }
+		dialog.Window = window
+	} else {
+		window, err := parent.NewModal(image.Rectangle { })
+		if err != nil { return nil, err }
+		dialog.Window = window
+	}
+
+	var iconId tomo.Icon
+	switch kind {
+	case DialogInformation: iconId = tomo.IconDialogInformation
+	case DialogQuestion:    iconId = tomo.IconDialogQuestion
+	case DialogWarning:     iconId = tomo.IconDialogWarning
+	case DialogError:       iconId = tomo.IconDialogError
+	}
+	dialog.SetTitle(title)
+	icon := NewIcon(iconId, tomo.IconSizeLarge)
+	messageText := NewLabel(message)
+	messageText.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
+
+	for _, option := range options {
+		if option, ok := option.(clickable); ok {
+			option.OnClick(dialog.Close)
+		}
+	}
+	dialog.controlRow = NewInnerContainer(layouts.ContractHorizontal, options...)
+	messageText.SetAttr(tomo.AAlign(tomo.AlignEnd, tomo.AlignEnd))
+
+	dialog.SetRoot(NewOuterContainer (
+		layouts.Column { true, false },
+		NewInnerContainer(layouts.ContractHorizontal, icon, messageText),
+		dialog.controlRow))
+	return dialog, nil
+}
+
+// NewDialogOk creates a new dialog window with an OK option.
+func NewDialogOk (kind DialogKind, parent tomo.Window, title, message string, onOk func ()) (*Dialog, error) {
+	okButton := NewButton("OK")
+	okButton.SetIcon(tomo.IconDialogOkay)
+	okButton.OnClick(func () {
+		if onOk != nil { onOk() }
+	})
+	okButton.SetFocused(true)
+	
+	return NewDialog(kind, parent, title, message, okButton)
+}
+
+// NewDialogOkCancel creates a new dialog window with OK and Cancel options.
+func NewDialogOkCancel (kind DialogKind, parent tomo.Window, title, message string, onOk func ()) (*Dialog, error) {
+	cancelButton := NewButton("Cancel")
+	cancelButton.SetIcon(tomo.IconDialogCancel)
+	
+	okButton := NewButton("OK")
+	okButton.SetIcon(tomo.IconDialogOkay)
+	okButton.OnClick(func () {
+		if onOk != nil { onOk() }
+	})
+	okButton.SetFocused(true)
+
+	return NewDialog(kind, parent, title, message, cancelButton, okButton)
+}
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,6 @@ module git.tebibyte.media/tomo/objects

 go 1.20

-require git.tebibyte.media/tomo/tomo v0.23.0
+require git.tebibyte.media/tomo/tomo v0.41.0

 require golang.org/x/image v0.11.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-git.tebibyte.media/tomo/tomo v0.23.0 h1:OZwI4oLKMP7JqFc98VxBoRxwjL+W9NyTQZLB/m1BvaA=
-git.tebibyte.media/tomo/tomo v0.23.0/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
+git.tebibyte.media/tomo/tomo v0.41.0 h1:Z+7FHhbGiKjs+kQNvuJOfz47xIct5qxvSJqyDuoNIOs=
+git.tebibyte.media/tomo/tomo v0.41.0/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
--- a/heading.go
+++ b/heading.go
@@ -2,7 +2,6 @@ package objects

 import "fmt"
 import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/tomo/theme"

 // Heading is a label that denotes the start of some section of content. It can
 // have a level from 0 to 2, with 0 being the most prominent and 2 being the
@@ -12,11 +11,12 @@ type Heading struct {
 }

 // NewHeading creates a new section heading. The level can be from 0 to 2.
-func NewHeading (level int, text string) *Label {
+func NewHeading (level int, text string) *Heading {
 	if level < 0 { level = 0 }
 	if level > 2 { level = 2 }
-	this := &Label { TextBox: tomo.NewTextBox() }
-	theme.Apply(this, theme.R("objects", "Heading", fmt.Sprint(level)))
+	this := &Heading { TextBox: tomo.NewTextBox() }
+	this.SetRole(tomo.R("objects", "Heading"))
+	this.SetTag(fmt.Sprint(level), true)
 	this.SetText(text)
 	return this
 }
--- a/icon.go
+++ b/icon.go
@@ -0,0 +1,52 @@
+package objects
+
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/data"
+import "git.tebibyte.media/tomo/tomo/canvas"
+
+// Icon displays a single icon.
+type Icon struct {
+	tomo.Box
+}
+
+func iconSizeString (size tomo.IconSize) string {
+	switch size {
+	case tomo.IconSizeLarge:  return "large"
+	case tomo.IconSizeMedium: return "medium"
+	default:                  return "small"
+	}
+}
+
+// NewIcon creates a new icon from an icon ID.
+func NewIcon (id tomo.Icon, size tomo.IconSize) *Icon {
+	this := &Icon {
+		Box: tomo.NewBox(),
+	}
+	this.SetRole(tomo.R("objects", "Icon"))
+	this.SetTag(iconSizeString(size), true)
+	this.setTexture(id.Texture(size))
+	return this
+}
+
+// NewMimeIcon creates a new icon from a MIME type.
+func NewMimeIcon (mime data.Mime, size tomo.IconSize) *Icon {
+	this := &Icon {
+		Box: tomo.NewBox(),
+	}
+	this.SetRole(tomo.R("objects", "Icon"))
+	this.SetTag(iconSizeString(size), true)
+	this.setTexture(tomo.MimeIcon(mime, size))
+	return this
+}
+
+func (this *Icon) setTexture (texture canvas.Texture) {
+	
+	this.SetAttr(tomo.ATexture(texture))
+	this.SetAttr(tomo.ATextureMode(tomo.TextureModeCenter))
+	if texture == nil {
+		this.SetAttr(tomo.AMinimumSize(0, 0))
+	} else {
+		bounds := texture.Bounds()
+		this.SetAttr(tomo.AttrMinimumSize(bounds.Max.Sub(bounds.Min)))
+	}
+}
--- a/internal/color.go
+++ b/internal/color.go
@@ -0,0 +1,104 @@
+package internal
+
+type HSVA struct {
+	H float64
+	S float64
+	V float64
+	A uint8
+}
+
+func (hsva HSVA) RGBA () (r, g, b, a uint32) {
+	// Adapted from:
+	// https://www.cs.rit.edu/~ncs/color/t_convert.html
+	
+	component := func (x float64) uint32 {
+		return uint32(float64(0xFFFF) * x)
+	}
+
+	ca := uint32(hsva.A) << 8
+	s := clamp01(hsva.S)
+	v := clamp01(hsva.V)
+	if s == 0 {
+		light := component(v)
+		return light, light, light, ca
+	}
+	
+	h := clamp01(hsva.H) * 360
+	sector := int(h / 60)
+	offset := (h / 60) - float64(sector)
+	
+	fac := float64(hsva.A) / 255
+	p  := component(fac * v * (1 - s))
+	q  := component(fac * v * (1 - s * offset))
+	t  := component(fac * v * (1 - s * (1 - offset)))
+	va := component(v)
+	
+	switch sector {
+	case 0:  return va, t,  p,  ca
+	case 1:  return q,  va, p,  ca
+	case 2:  return p,  va, t,  ca
+	case 3:  return p,  q,  va, ca
+	case 4:  return t,  p,  va, ca
+	default: return va, p,  q,  ca
+	}
+}
+
+// Canon returns the color but with the H, S, and V fields are constrained to
+// the range 0.0-1.0
+func (hsva HSVA) Canon () HSVA {
+	hsva.H = clamp01(hsva.H)
+	hsva.S = clamp01(hsva.S)
+	hsva.V = clamp01(hsva.V)
+	return hsva
+}
+
+func clamp01 (x float64) float64 {
+	if x > 1.0 { return 1.0 }
+	if x < 0.0 { return 0.0 }
+	return x
+}
+
+func RGBAToHSVA (r, g, b, a uint32) HSVA {
+	// Adapted from:
+	// https://www.cs.rit.edu/~ncs/color/t_convert.html
+	
+	component := func (x uint32) float64 {
+		return clamp01(float64(x) / 0xFFFF)
+	}
+	cr := component(r)
+	cg := component(g)
+	cb := component(b)
+	
+	var maxComponent float64
+	if cr > maxComponent { maxComponent = cr }
+	if cg > maxComponent { maxComponent = cg }
+	if cb > maxComponent { maxComponent = cb }
+	var minComponent = 1.0
+	if cr < minComponent { minComponent = cr }
+	if cg < minComponent { minComponent = cg }
+	if cb < minComponent { minComponent = cb }
+	
+	hsva := HSVA {
+		V: maxComponent,
+		A: uint8(a >> 8),
+	}
+	
+	delta := maxComponent - minComponent
+	if delta == 0 {
+		// hsva.S is undefined, so hue doesn't matter
+		return hsva
+	}
+	hsva.S = delta / maxComponent
+	
+	switch {
+	case cr == maxComponent: hsva.H =     (cg - cb) / delta
+	case cg == maxComponent: hsva.H = 2 + (cb - cr) / delta
+	case cb == maxComponent: hsva.H = 4 + (cr - cg) / delta
+	}
+	
+	hsva.H *= 60
+	if hsva.H < 0 { hsva.H += 360 }
+	hsva.H /= 360
+	
+	return hsva
+}
--- a/label.go
+++ b/label.go
@@ -1,7 +1,6 @@
 package objects

 import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/tomo/theme"

 // Label is a simple text label.
 type Label struct {
@@ -11,8 +10,8 @@ type Label struct {
 // NewLabel creates a new text label.
 func NewLabel (text string) *Label {
 	this := &Label { TextBox: tomo.NewTextBox() }
-	theme.Apply(this, theme.R("objects", "Label", ""))
+	this.SetRole(tomo.R("objects", "Label"))
 	this.SetText(text)
+	this.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
 	return this
 }
-
--- a/labelcheckbox.go
+++ b/labelcheckbox.go
@@ -0,0 +1,67 @@
+package objects
+
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// LabelCheckbox is a checkbox with a label.
+type LabelCheckbox struct {
+	tomo.ContainerBox
+	checkbox *Checkbox
+	label    *Label
+}
+
+// NewLabelCheckbox creates a new labeled checkbox with the specified value and
+// label text.
+func NewLabelCheckbox (value bool, text string) *LabelCheckbox {
+	box := &LabelCheckbox {
+		ContainerBox: tomo.NewContainerBox(),
+		checkbox:     NewCheckbox(value),
+		label:        NewLabel(text),
+	}
+	box.SetRole(tomo.R("objects", "LabelCheckbox"))
+	box.label.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
+	box.Add(box.checkbox)
+	box.Add(box.label)
+	box.SetAttr(tomo.ALayout(layouts.Row { false, true }))
+
+	box.OnButtonDown(box.handleButtonDown)
+	box.OnButtonUp(box.handleButtonUp)
+	return box
+}
+
+// Value returns the value of the checkbox.
+func (this *LabelCheckbox) Value () bool {
+	return this.checkbox.Value()
+}
+
+// SetValue sets the value of the checkbox.
+func (this *LabelCheckbox) SetValue (value bool) {
+	this.checkbox.SetValue(value)
+}
+
+// Toggle toggles the value of the checkbox between true and false.
+func (this *LabelCheckbox) Toggle () {
+	this.checkbox.Toggle()
+}
+
+// OnValueChange specifies a function to be called when the user checks or
+// unchecks the checkbox.
+func (this *LabelCheckbox) OnValueChange (callback func ()) event.Cookie {
+	return this.checkbox.OnValueChange(callback)
+}
+
+func (this *LabelCheckbox) handleButtonDown (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	return true
+}
+
+func (this *LabelCheckbox) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	if this.Window().MousePosition().In(this.Bounds()) {
+		this.checkbox.SetFocused(true)
+		this.checkbox.Toggle()
+	}
+	return true
+}
--- a/labelswatch.go
+++ b/labelswatch.go
@@ -0,0 +1,75 @@
+package objects
+
+import "image/color"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// LabelSwatch is a swatch with a label.
+type LabelSwatch struct {
+	tomo.ContainerBox
+	swatch  *Swatch
+	label   *Label
+}
+
+// NewLabelSwatch creates a new labeled swatch with the specified color and
+// label text.
+func NewLabelSwatch (value color.Color, text string) *LabelSwatch {
+	box := &LabelSwatch {
+		ContainerBox: tomo.NewContainerBox(),
+		swatch:       NewSwatch(value),
+		label:        NewLabel(text),
+	}
+	box.SetRole(tomo.R("objects", "LabelSwatch"))
+	box.swatch.label = text
+	box.label.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
+	box.Add(box.swatch)
+	box.Add(box.label)
+	box.SetAttr(tomo.ALayout(layouts.Row { false, true }))
+
+	box.OnButtonDown(box.handleButtonDown)
+	box.OnButtonUp(box.handleButtonUp)
+	return box
+}
+
+// Value returns the color of the swatch.
+func (this *LabelSwatch) Value () color.Color {
+	return this.swatch.Value()
+}
+
+// SetValue sets the color of the swatch.
+func (this *LabelSwatch) SetValue (value color.Color) {
+	this.swatch.SetValue(value)
+}
+
+// OnValueChange specifies a function to be called when the swatch's color
+// is changed by the user.
+func (this *LabelSwatch) OnValueChange (callback func ()) event.Cookie {
+	return this.swatch.OnValueChange(callback)
+}
+
+// RGBA satisfies the color.Color interface
+func (this *LabelSwatch) RGBA () (r, g, b, a uint32) {
+	return this.swatch.RGBA()
+}
+
+// OnConfirm specifies a function to be called when the user selects "OK" in the
+// color picker.
+func (this *LabelSwatch) OnConfirm (callback func ()) event.Cookie {
+	return this.swatch.OnConfirm(callback)
+}
+
+func (this *LabelSwatch) handleButtonDown (button input.Button) bool {
+	if button != input.ButtonLeft { return true }
+	return true
+}
+
+func (this *LabelSwatch) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft { return true }
+	if this.Window().MousePosition().In(this.Bounds()) {
+		this.swatch.SetFocused(true)
+		this.swatch.Choose()
+	}
+	return true
+}
--- a/layouts/contract.go
+++ b/layouts/contract.go
@@ -0,0 +1,40 @@
+package layouts
+
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+
+var _ tomo.Layout = ContractVertical
+
+// Contract is a layout that arranges boxes in a simple row or column according
+// to their minimum sizes.
+type Contract bool
+
+// ContractVertical is a vertical contracted layout.
+const ContractVertical Contract = true
+
+// ContractHorizontal is a horizontal contracted layout.
+const ContractHorizontal Contract = false
+
+func (contract Contract) MinimumSize (hints tomo.LayoutHints, boxes tomo.BoxQuerier) image.Point {
+	return contract.fallback().MinimumSize(hints, boxes)
+}
+
+func (contract Contract) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
+	contract.fallback().Arrange(hints, boxes)
+}
+
+func (contract Contract) RecommendedHeight (hints tomo.LayoutHints, boxes tomo.BoxQuerier, width int) int {
+	return contract.fallback().RecommendedHeight(hints, boxes, width)
+}
+
+func (contract Contract) RecommendedWidth (hints tomo.LayoutHints, boxes tomo.BoxQuerier, height int) int {
+	return contract.fallback().RecommendedWidth(hints, boxes, height)
+}
+
+func (contract Contract) fallback () tomo.Layout {
+	if contract == ContractVertical {
+		return Column { }
+	} else {
+		return Row { }
+	}
+}
--- a/layouts/cut.go
+++ b/layouts/cut.go
@@ -1,212 +0,0 @@
-package layouts
-
-import "image"
-import "git.tebibyte.media/tomo/tomo"
-
-// Cut is a layout that can be divided into smaller and smaller sections.
-type Cut struct {
-	branches [2]*Cut
-	expand   [2]bool
-	vertical bool
-}
-
-// Vertical divides the layout in equal halves vertically.
-func (this *Cut) Vertical () (top, bottom *Cut) {
-	this.fill()
-	this.even()
-	this.vertical = true
-	return this.Branches()
-}
-
-// Top divides the layout vertically, expanding the top half and contracting the
-// bottom half.
-func (this *Cut) Top () (top, bottom *Cut) {
-	this.fill()
-	this.first()
-	this.vertical = true
-	return this.Branches()
-}
-
-// Bottom divides the layout vertically, expanding the bottom half and
-// contracting the top half.
-func (this *Cut) Bottom () (top, bottom *Cut) {
-	this.fill()
-	this.second()
-	this.vertical = true
-	return this.Branches()
-}
-
-// Horizontal divides the layout in equal halves horizontally.
-func (this *Cut) Horizontal () (top, bottom *Cut) {
-	this.fill()
-	this.even()
-	return this.Branches()
-}
-
-// Left divides the layout horizontally, expanding the left half and contracting
-// the right half.
-func (this *Cut) Left () (top, bottom *Cut) {
-	this.fill()
-	this.first()
-	return this.Branches()
-}
-
-// Right divides the layout horizontally, expanding the right half and
-// contracting the left half.
-func (this *Cut) Right () (top, bottom *Cut) {
-	this.fill()
-	this.second()
-	return this.Branches()
-}
-
-// Branches returns the two halves of this layout.
-func (this *Cut) Branches () (first, second *Cut) {
-	return this.branches[0], this.branches[1]
-}
-
-func (this *Cut) real () bool {
-	return this != nil && this.branches[0] != nil && this.branches[1] != nil
-}
-
-func (this *Cut) fill () {
-	this.branches[0] = &Cut { }
-	this.branches[1] = &Cut { }
-}
-
-func (this *Cut) first () {
-	this.expand[0] = true
-	this.expand[1] = false
-}
-
-func (this *Cut) second () {
-	this.expand[0] = false
-	this.expand[1] = true
-}
-
-func (this *Cut) even () {
-	this.expand[0] = true
-	this.expand[1] = true
-}
-
-func (this *Cut) MinimumSize (hints tomo.LayoutHints, boxes []tomo.Box) image.Point {
-	size, _ := this.minimumSize(hints, boxes)
-	return size
-}
-
-func (this *Cut) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
-	this.arrange(hints, boxes)
-}
-
-func (this *Cut) minimumSize (hints tomo.LayoutHints, boxes []tomo.Box) (image.Point, []tomo.Box) {
-	size := image.Point { }
-
-	for index, branch := range this.branches {
-		if len(boxes) == 0 { break }
-
-		var point image.Point
-		if branch.real() {
-			point, boxes = branch.minimumSize(hints, boxes)
-		} else {
-			point = boxes[0].MinimumSize()
-			boxes = boxes[1:]
-		}
-
-		if this.vertical {
-			if point.X > size.X { size.X  = point.X     }
-			if index   > 0      { size.Y += hints.Gap.Y }
-			size.Y += point.Y
-		} else {
-			if point.Y > size.Y { size.Y  = point.Y     }
-			if index   > 0      { size.X += hints.Gap.X }
-			size.X += point.X
-		}
-	}
-
-	return size, boxes
-}
-
-func (this *Cut) arrange (hints tomo.LayoutHints, boxes []tomo.Box) []tomo.Box {
-	// collect minimum sizes and physical endpoints
-	var minimums [2]image.Point
-	var leaves   [2]tomo.Box
-	var nBranches int
-	remaining := boxes
-	for index, branch := range this.branches {
-		if branch.real() {
-			minimums[index], remaining = branch.minimumSize(hints, remaining)
-		} else {
-			if len(remaining) == 0 { break }
-			leaves[index]   = remaining[0]
-			minimums[index] = remaining[0].MinimumSize()
-			remaining       = remaining[1:]
-		}
-		nBranches ++
-	}
-
-	// determine the amount of space to divide among expanding branches
-	gaps := nBranches - 1
-	var freeSpace float64; if this.vertical {
-		freeSpace = float64(hints.Bounds.Dy() - hints.Gap.Y * gaps)
-	} else {
-		freeSpace = float64(hints.Bounds.Dx() - hints.Gap.X * gaps)
-	}
-	var nExpanding float64
-	for index, minimum := range minimums {
-		if this.expand[index] {
-			nExpanding ++
-		} else if this.vertical {
-			freeSpace -= float64(minimum.Y)
-		} else {
-			freeSpace -= float64(minimum.X)
-		}
-	}
-	expandingSize := freeSpace / nExpanding
-
-	// calculate the size and position of branches
-	var bounds [2]image.Rectangle
-	x := float64(hints.Bounds.Min.X)
-	y := float64(hints.Bounds.Min.Y)
-	for index, minimum := range minimums {
-		// get size along significant axis
-		var size float64; if this.expand[index] {
-			size = expandingSize
-		} else if this.vertical {
-			size = float64(minimum.Y)
-		} else {
-			size = float64(minimum.X)
-		}
-
-		// figure out bounds from size
-		if this.vertical {
-			bounds[index].Max = image.Pt (
-				int(hints.Bounds.Dx()),
-				int(size))
-		} else {
-			bounds[index].Max = image.Pt (
-				int(size),
-				int(hints.Bounds.Dy()))
-		}
-		bounds[index] = bounds[index].Add(image.Pt(int(x), int(y)))
-
-		// move along
-		if this.vertical {
-			y += float64(hints.Gap.Y) + size
-		} else {
-			x += float64(hints.Gap.X) + size
-		}
-	}
-
-	// apply the size and position
-	for index, bound := range bounds {
-		if leaves[index] != nil {
-			leaves[index].SetBounds(bound)
-			boxes = boxes[1:]
-		} else if this.branches[index] != nil {
-			newHints := hints
-			newHints.Bounds = bound
-			boxes = this.branches[index].arrange(newHints, boxes)
-		}
-	}
-	
-	return boxes
-}
--- a/layouts/flow.go
+++ b/layouts/flow.go
@@ -0,0 +1,135 @@
+package layouts
+
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+
+var _ tomo.Layout = FlowVertical
+
+// Flow is a grid layout where the number of rows and columns changes depending
+// on the size of the container. It is designed to be used with an overflowing
+// container. If the container does not overflow in the correct direction, the
+// layout will behave like Contract.
+type Flow bool
+
+// FlowVertical is a vertical flow layout.
+const FlowVertical Flow = true
+
+// FlowHorizontal is a horizontal flow layout.
+const FlowHorizontal Flow = false
+
+func (flow Flow) MinimumSize (hints tomo.LayoutHints, boxes tomo.BoxQuerier) image.Point {
+	// TODO: write down somewhere that layout minimums aren't taken into
+	// account when the respective direction is overflowed
+	return flow.fallback().MinimumSize(hints, boxes)
+}
+
+func (flow Flow) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
+	if flow.v() && !hints.OverflowY || flow.h() && !hints.OverflowX {
+		flow.fallback().Arrange(hints, boxes)
+	}
+
+	// find a minor size value that will fit all boxes
+	minorSize := 0
+	for index := 0; index < boxes.Len(); index ++ {
+		boxSize := flow.minor(boxes.MinimumSize(index))
+		if boxSize > minorSize { minorSize = boxSize }
+	}
+	if minorSize == 0 { return }
+	minorSteps :=
+		(flow.deltaMinor(hints.Bounds) + flow.minor(hints.Gap)) /
+		(minorSize + flow.minor(hints.Gap))
+	if minorSteps < 1 { minorSteps = 1 }
+
+	// arrange
+	point := hints.Bounds.Min
+	index := 0
+	for index < boxes.Len() {
+		// get a slice of boxes for this major step
+		stepIndexEnd := index + minorSteps
+		if stepIndexEnd > boxes.Len() { stepIndexEnd = boxes.Len() }
+		index += minorSteps
+		
+		// find a major size that will fit all boxes on this major step
+		majorSize := 0
+		for index := index; index < stepIndexEnd; index ++ {
+			boxSize := flow.major(boxes.MinimumSize(index))
+			if boxSize > majorSize { majorSize = boxSize }
+		}
+		if majorSize == 0 { continue }
+
+		// arrange all boxes on this major step
+		var size image.Point
+		size = flow.incrMajor(size, majorSize)
+		size = flow.incrMinor(size, minorSize)
+		for index := index; index < stepIndexEnd; index ++ {
+			bounds := image.Rectangle { Min: point, Max: point.Add(size) }
+			boxes.SetBounds(index, bounds)
+
+			point = flow.incrMinor(point, minorSize + flow.minor(hints.Gap))
+		}
+
+		if flow.v() {
+			point.Y += majorSize + hints.Gap.Y
+			point.X = hints.Bounds.Min.X
+		} else {
+			point.X += majorSize + hints.Gap.X
+			point.Y = hints.Bounds.Min.Y
+		}
+	}
+}
+
+func (flow Flow) v () bool { return flow == FlowVertical   }
+func (flow Flow) h () bool { return flow == FlowHorizontal }
+
+func (flow Flow) minor (point image.Point) int {
+	if flow.v() {
+		return point.X
+	} else {
+		return point.Y
+	}
+}
+func (flow Flow) major (point image.Point) int {
+	if flow.v() {
+		return point.Y
+	} else {
+		return point.X
+	}
+}
+func (flow Flow) incrMinor (point image.Point, delta int) image.Point {
+	if flow.v() {
+		point.X += delta
+		return point
+	} else {
+		point.Y += delta
+		return point
+	}
+}
+func (flow Flow) incrMajor (point image.Point, delta int) image.Point {
+	if flow.v() {
+		point.Y += delta
+		return point
+	} else {
+		point.X += delta
+		return point
+	}
+}
+func (flow Flow) deltaMinor (rectangle image.Rectangle) int {
+	if flow.v() {
+		return rectangle.Dx()
+	} else {
+		return rectangle.Dy()
+	}
+}
+func (flow Flow) fallback () tomo.Layout {
+	return Contract(flow)
+}
+
+func (flow Flow) RecommendedHeight (hints tomo.LayoutHints, boxes tomo.BoxQuerier, width int) int {
+	// TODO
+	return 0
+}
+
+func (flow Flow) RecommendedWidth (hints tomo.LayoutHints, boxes tomo.BoxQuerier, height int) int {
+	// TODO
+	return 0
+}
--- a/layouts/grid.go
+++ b/layouts/grid.go
@@ -0,0 +1,125 @@
+package layouts
+
+import "math"
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+
+var _ tomo.Layout = new(Grid)
+
+// Grid is a layout that arranges boxes in a grid formation with distinct rows
+// and columns. It is great for creating forms.
+type Grid struct {
+	xExpand []bool
+	yExpand []bool
+}
+
+// NewGrid creates a new grid layout. Rows and columns are specified as slices
+// of booleans, where true means a row or column will expand and false means it
+// will contract. Boxes are laid out left to right, then top to bottom. Boxes
+// that go beyond the lengh of rows will be laid out according to columns, but
+// they will not expand vertically.
+//
+// If you aren't sure how to use this constructor, here is an example:
+//
+//            X0     X1    X2     Y0    Y1    Y2
+//   NewGrid(true, false, true)(false, true, true)
+func NewGrid (columns ...bool) func (rows ...bool) *Grid {
+	return func (rows ...bool) *Grid {
+		return &Grid {
+			xExpand: columns,
+			yExpand: rows,
+		}
+	}
+}
+
+func (this *Grid) MinimumSize (hints tomo.LayoutHints, boxes tomo.BoxQuerier) image.Point {
+	cols, rows := this.minimums(boxes)
+	size := image.Pt (
+		(len(cols) - 1) * hints.Gap.X,
+		(len(rows) - 1) * hints.Gap.Y)
+	for _, width  := range cols { size.X += width  }
+	for _, height := range rows { size.Y += height }
+	return size
+}
+
+func (this *Grid) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
+	xExpand := func (index int) bool {
+		return this.xExpand[index]
+	}
+	yExpand := func (index int) bool {
+		if index < len(this.yExpand) { return this.yExpand[index] }
+		return false
+	}
+
+	cols, rows := this.minimums(boxes)
+	expand(hints, cols, hints.Bounds.Dx(), xExpand)
+	expand(hints, rows, hints.Bounds.Dy(), yExpand)
+
+	position := hints.Bounds.Min
+	for index := 0; index < boxes.Len(); index ++ {
+		col, row := index % len(cols), index / len(cols)
+		boxes.SetBounds(index, image.Rectangle {
+			Min: position,
+			Max: position.Add(image.Pt(cols[col], rows[row])),
+		})
+		if col == len(cols) - 1 {
+			position.X = hints.Bounds.Min.X
+			position.Y += rows[row] + hints.Gap.Y
+		} else {
+			position.X += cols[col] + hints.Gap.X
+		}
+	}
+}
+
+func (this *Grid) minimums (boxes tomo.BoxQuerier) ([]int, []int) {
+	nCols, nRows := this.dimensions(boxes)
+	cols,  rows  := make([]int, nCols), make([]int, nRows)
+
+	for index := 0; index < boxes.Len(); index ++ {
+		col, row := index % len(cols), index / len(cols)
+		minimum := boxes.MinimumSize(index)
+		if cols[col] < minimum.X {
+			cols[col] = minimum.X
+		}
+		if rows[row] < minimum.Y {
+			rows[row] = minimum.Y
+		}
+	}
+	
+	return cols, rows
+}
+
+func (this *Grid) dimensions (boxes tomo.BoxQuerier) (int, int) {
+	return len(this.xExpand), ceilDiv(boxes.Len(), len(this.xExpand)) 
+}
+
+func expand (hints tomo.LayoutHints, sizes []int, space int, expands func (int) bool) {
+	gaps       := len(sizes) - 1
+	freeSpace  := float64(space - hints.Gap.Y * gaps)
+	nExpanding := 0; for index, minimum := range sizes {
+		if expands(index) {
+			nExpanding ++
+		} else {
+			freeSpace -= float64(minimum)
+		}
+	}
+	expandingSize := freeSpace / float64(nExpanding)
+	for index := range sizes {
+		if expands(index) {
+			sizes[index] = int(expandingSize)
+		}
+	}
+}
+
+func ceilDiv (x, y int) int {
+	if y == 0 { return 0 }
+	return int(math.Ceil(float64(x) / float64(y)))
+}
+
+func (this *Grid) RecommendedHeight (hints tomo.LayoutHints, boxes tomo.BoxQuerier, width int) int {
+	return this.MinimumSize(hints, boxes).Y
+}
+
+func (this *Grid) RecommendedWidth (hints tomo.LayoutHints, boxes tomo.BoxQuerier, height int) int {
+	return this.MinimumSize(hints, boxes).X
+}
--- a/layouts/layouts.go
+++ b/layouts/layouts.go
@@ -1,88 +0,0 @@
-package layouts
-
-import "image"
-import "git.tebibyte.media/tomo/tomo"
-
-type Row struct { }
-
-func (Row) MinimumSize (hints tomo.LayoutHints, boxes []tomo.Box) image.Point {
-	dot := image.Point { }
-	for _, box := range boxes {
-		minimum := box.MinimumSize()
-		dot.X += minimum.X
-		if dot.Y < minimum.Y {
-			dot.Y = minimum.Y
-		}
-	}
-	dot.X += hints.Gap.X * (len(boxes) - 1)
-	return dot
-}
-
-func (Row) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
-	// TODO respect alignment value
-	dot := hints.Bounds.Min
-	for index, box := range boxes {
-		if index > 0 { dot.X += hints.Gap.X }
-		minimum := box.MinimumSize()
-		box.SetBounds(image.Rectangle {
-			Min: dot,
-			Max: dot.Add(image.Pt(minimum.X, hints.Bounds.Dy())),
-		})
-		dot.X += minimum.X
-	}
-
-	width  := dot.X - hints.Bounds.Min.X
-	offset := 0
-	
-	switch hints.AlignX {
-	case tomo.AlignMiddle:
-		offset = (hints.Bounds.Dx() - width) / 2
-	case tomo.AlignEnd:
-		offset = hints.Bounds.Dx() - width
-	}
-	for _, box := range boxes {
-		box.SetBounds(box.Bounds().Add(image.Pt(offset, 0)))
-	}
-}
-
-type Column struct { }
-
-func (Column) MinimumSize (hints tomo.LayoutHints, boxes []tomo.Box) image.Point {
-	dot := image.Point { }
-	for _, box := range boxes {
-		minimum := box.MinimumSize()
-		dot.Y += minimum.Y
-		if dot.X < minimum.X {
-			dot.X = minimum.X
-		}
-	}
-	dot.Y += hints.Gap.Y * (len(boxes) - 1)
-	return dot
-}
-
-func (Column) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
-	// TODO respect alignment value
-	dot := hints.Bounds.Min
-	for index, box := range boxes {
-		if index > 0 { dot.Y += hints.Gap.Y }
-		minimum := box.MinimumSize()
-		box.SetBounds(image.Rectangle {
-			Min: dot,
-			Max: dot.Add(image.Pt(hints.Bounds.Dx(), minimum.Y)),
-		})
-		dot.Y += minimum.Y
-	}
-	
-	height := dot.Y - hints.Bounds.Min.Y
-	offset := 0
-	
-	switch hints.AlignY {
-	case tomo.AlignMiddle:
-		offset = (hints.Bounds.Dy() - height) / 2
-	case tomo.AlignEnd:
-		offset = hints.Bounds.Dy() - height
-	}
-	for _, box := range boxes {
-		box.SetBounds(box.Bounds().Add(image.Pt(0, offset)))
-	}
-}
--- a/layouts/rowcol.go
+++ b/layouts/rowcol.go
@@ -0,0 +1,220 @@
+package layouts
+
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+
+var _ tomo.Layout = ContractVertical
+
+// Row arranges boxes in a row. Boxes that share an index with a true value will
+// expand, and others will contract.
+type Row []bool
+
+// Column arranges boxes in a column. Boxes that share an index with a true
+// value will expand, and others will contract.
+type Column []bool
+
+func (column Column) MinimumSize (hints tomo.LayoutHints, boxes tomo.BoxQuerier) image.Point {
+	dot := image.Point { }
+	for index := 0; index < boxes.Len(); index ++ {
+		minimum := boxes.MinimumSize(index)
+		dot.Y += minimum.Y
+		if dot.X < minimum.X {
+			dot.X = minimum.X
+		}
+	}
+	dot.Y += hints.Gap.Y * (boxes.Len() - 1)
+	return dot
+}
+
+func (row Row) MinimumSize (hints tomo.LayoutHints, boxes tomo.BoxQuerier) image.Point {
+	dot := image.Point { }
+	for index := 0; index < boxes.Len(); index ++ {
+		minimum := boxes.MinimumSize(index)
+		dot.X += minimum.X
+		if dot.Y < minimum.Y {
+			dot.Y = minimum.Y
+		}
+	}
+	dot.X += hints.Gap.X * (boxes.Len() - 1)
+	return dot
+}
+
+func (column Column) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
+	expands := func (index int) bool {
+		if index >= len(column) { return false }
+		return column[index]
+	}
+
+	// determine expanding box size
+	expandingSize := 0.0
+	if !hints.OverflowY {
+		gaps       := boxes.Len() - 1
+		freeSpace  := float64(hints.Bounds.Dy() - hints.Gap.Y * gaps)
+		nExpanding := 0;
+		for index := 0; index < boxes.Len(); index ++ {
+			if expands(index) {
+				nExpanding ++
+			} else {
+				freeSpace -= float64(boxes.MinimumSize(index).Y)
+			}
+		}
+		expandingSize = freeSpace / float64(nExpanding)
+	}
+
+	// determine width
+	width := 0
+	if hints.OverflowX {
+		for index := 0; index < boxes.Len(); index ++ {
+			minimum := boxes.MinimumSize(index)
+			if width < minimum.X { width = minimum.X }
+		}
+	} else {
+		width = hints.Bounds.Dx()
+	}
+
+	// arrange
+	dot := hints.Bounds.Min
+	bounds := make([]image.Rectangle, boxes.Len())
+	for index := 0; index < boxes.Len(); index ++ {
+		if index > 0 { dot.Y += hints.Gap.Y }
+
+		// determine height
+		height := boxes.MinimumSize(index).Y
+		if hints.OverflowY {
+			height = boxes.RecommendedHeight(index, width)
+		} else {
+			if expands(index) {
+				height = int(expandingSize)
+			}
+		}
+
+		// store bounds of this box
+		bounds[index] = image.Rectangle {
+			Min: dot,
+			Max: dot.Add(image.Pt(width, height)),
+		}
+		dot.Y += height
+	}
+
+	// align
+	height := dot.Y - hints.Bounds.Min.Y
+	offset := 0
+	switch hints.AlignY {
+	case tomo.AlignMiddle:
+		offset = (hints.Bounds.Dy() - height) / 2
+	case tomo.AlignEnd:
+		offset = hints.Bounds.Dy() - height
+	}
+	for index := 0; index < boxes.Len(); index ++ {
+		boxes.SetBounds(index, bounds[index].Add(image.Pt(0, offset)))
+	}
+}
+
+func (row Row) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
+	expands := func (index int) bool {
+		if index >= len(row) { return false }
+		return row[index]
+	}
+
+	// determine expanding box size
+	expandingSize := 0.0
+	if !hints.OverflowY {
+		gaps       := boxes.Len() - 1
+		freeSpace  := float64(hints.Bounds.Dx() - hints.Gap.X * gaps)
+		nExpanding := 0;
+		for index := 0; index < boxes.Len(); index ++ {
+			if expands(index) {
+				nExpanding ++
+			} else {
+				freeSpace -= float64(boxes.MinimumSize(index).X)
+			}
+		}
+		expandingSize = freeSpace / float64(nExpanding)
+	}
+
+	// determine height
+	height := 0
+	if hints.OverflowY {
+		for index := 0; index < boxes.Len(); index ++ {
+			minimum := boxes.MinimumSize(index)
+			if height < minimum.Y { height = minimum.Y }
+		}
+	} else {
+		height = hints.Bounds.Dy()
+	}
+
+	// arrange
+	dot := hints.Bounds.Min
+	bounds := make([]image.Rectangle, boxes.Len())
+	for index := 0; index < boxes.Len(); index ++ {
+		if index > 0 { dot.X += hints.Gap.X }
+
+		// determine width
+		width := boxes.MinimumSize(index).X
+		if hints.OverflowY {
+			width = boxes.RecommendedHeight(index, height)
+		} else {
+			if expands(index) {
+				width = int(expandingSize)
+			}
+		}
+
+		// store bounds
+		bounds[index] = image.Rectangle {
+			Min: dot,
+			Max: dot.Add(image.Pt(width, height)),
+		}
+		dot.X += width
+	}
+
+	// align
+	width  := dot.X - hints.Bounds.Min.X
+	offset := 0
+	switch hints.AlignX {
+	case tomo.AlignMiddle:
+		offset = (hints.Bounds.Dx() - width) / 2
+	case tomo.AlignEnd:
+		offset = hints.Bounds.Dx() - width
+	}
+	for index := 0; index < boxes.Len(); index ++ {
+		boxes.SetBounds(index, bounds[index].Add(image.Pt(offset, 0)))
+	}
+}
+
+func (column Column) RecommendedHeight (hints tomo.LayoutHints, boxes tomo.BoxQuerier, width int) int {
+	height := 0
+	for index := 0; index < boxes.Len(); index ++ {
+		height += boxes.RecommendedHeight(index, width)
+	}
+	height += hints.Gap.Y * (boxes.Len() - 1)
+	return height
+}
+
+func (row Row) RecommendedHeight (hints tomo.LayoutHints, boxes tomo.BoxQuerier, width int) int {
+	height := 0
+	for index := 0; index < boxes.Len(); index ++ {
+		minimum   := boxes.MinimumSize(index)
+		boxHeight := boxes.RecommendedHeight(index, minimum.X)
+		if boxHeight > height { height = boxHeight }
+	}
+	return height
+}
+
+func (column Column) RecommendedWidth (hints tomo.LayoutHints, boxes tomo.BoxQuerier, height int) int {
+	width := 0
+	for index := 0; index < boxes.Len(); index ++ {
+		minimum  := boxes.MinimumSize(index)
+		boxWidth := boxes.RecommendedWidth(index, minimum.Y)
+		if boxWidth > width { width = boxWidth }
+	}
+	return width
+}
+
+func (row Row) RecommendedWidth (hints tomo.LayoutHints, boxes tomo.BoxQuerier, height int) int {
+	width := 0
+	for index := 0; index < boxes.Len(); index ++ {
+		width += boxes.RecommendedWidth(index, height)
+	}
+	width += hints.Gap.X * (boxes.Len() - 1)
+	return width
+}
--- a/menu.go
+++ b/menu.go
@@ -0,0 +1,115 @@
+package objects
+
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+// import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// Menu is a menu window.
+type Menu struct {
+	tomo.Window
+
+	parent        tomo.Window
+	bounds        image.Rectangle
+	rootContainer tomo.ContainerBox
+	tearLine      tomo.Object
+	torn          bool
+}
+
+// NewMenu creates a new menu with the specified items. The menu will appear
+// directly under the anchor Object. If the anchor is nil, it will appear
+// directly under the mouse pointer instead.
+func NewMenu (anchor tomo.Object, items ...tomo.Object) (*Menu, error) {
+	menu := &Menu { }
+	if anchor == nil {
+		// TODO: *actually* put it under the mouse
+		window, err := tomo.NewWindow(menu.bounds)
+		if err != nil { return nil, err }
+		menu.Window = window
+	} else {
+		menu.bounds = menuBoundsFromAnchor(anchor)
+		menu.parent = anchor.GetBox().Window()
+		window, err := menu.parent.NewMenu(menu.bounds)
+		if err != nil { return nil, err }
+		menu.Window = window
+	}
+
+	menu.rootContainer = tomo.NewContainerBox()
+	menu.rootContainer.SetAttr(tomo.ALayout(layouts.ContractVertical))
+
+	if !menu.torn {
+		menu.tearLine = menu.newTearLine()
+		menu.rootContainer.Add(menu.tearLine)
+	}
+	
+	for _, item := range items {
+		menu.rootContainer.Add(item)
+		if item, ok := item.(*MenuItem); ok {
+			item.OnClick(func () {
+				if !menu.torn {
+					menu.Close()
+				}
+			})
+		}
+	}
+	menu.rootContainer.SetRole(tomo.R("objects", "Container"))
+	menu.rootContainer.SetTag("menu", true)
+
+	menu.Window.SetRoot(menu.rootContainer)
+	return menu, nil
+}
+
+// TearOff converts this menu into a tear-off menu.
+func (this *Menu) TearOff () {
+	if this.torn          { return }
+	if this.parent == nil { return }
+	this.torn = true
+
+	window, err := this.parent.NewChild(this.bounds)
+	if err != nil { return }
+
+	visible := this.Window.Visible()
+	this.Window.SetRoot(nil)
+	this.Window.Close()
+
+	this.rootContainer.Remove(this.tearLine)
+	
+	this.Window = window
+	this.Window.SetRoot(this.rootContainer)
+	this.Window.SetVisible(visible)
+}
+
+func (this *Menu) newTearLine () tomo.Object {
+	tearLine := tomo.NewBox()
+	tearLine.SetRole(tomo.R("objects", "TearLine"))
+	tearLine.SetFocusable(true)
+	tearLine.OnKeyDown(func (key input.Key, numberPad bool) bool {
+		if key != input.KeyEnter && key != input.Key(' ') { return false }
+		return true
+	})
+	tearLine.OnKeyUp(func (key input.Key, numberPad bool) bool {
+		if key != input.KeyEnter && key != input.Key(' ') { return false }
+		this.TearOff()
+		return true
+	})
+	tearLine.OnButtonDown(func (button input.Button) bool {
+		if button != input.ButtonLeft { return false }
+		return true
+	})
+	tearLine.OnButtonUp(func (button input.Button) bool {
+		if button != input.ButtonLeft { return false }
+		if tearLine.Window().MousePosition().In(tearLine.Bounds()) {
+			this.TearOff()
+		}
+		return true
+	})
+	return tearLine
+}
+
+func menuBoundsFromAnchor (anchor tomo.Object) image.Rectangle {
+	bounds := anchor.GetBox().Bounds()
+	return image.Rect (
+		bounds.Min.X, bounds.Max.Y,
+		bounds.Max.X, bounds.Max.Y)//.Add(windowBounds.Min)
+}
--- a/menuitem.go
+++ b/menuitem.go
@@ -0,0 +1,83 @@
+package objects
+
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// MenuItem is a selectable memu item.
+type MenuItem struct {
+	tomo.ContainerBox
+
+	label *Label
+	icon  *Icon
+	labelActive bool
+	
+	on struct {
+		click event.FuncBroadcaster
+	}
+}
+
+// NewMenuItem creates a new menu item with the specified text.
+func NewMenuItem (text string) *MenuItem {
+	box := &MenuItem {
+		ContainerBox: tomo.NewContainerBox(),
+		label:        NewLabel(text),
+		icon:         NewIcon("", tomo.IconSizeSmall),
+	}
+	box.SetRole(tomo.R("objects", "MenuItem"))
+	box.label.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
+	box.SetAttr(tomo.ALayout(layouts.Row { false, true }))
+	
+	box.Add(box.icon)
+	box.Add(box.label)
+	
+	box.SetInputMask(true)
+	box.OnButtonDown(box.handleButtonDown)
+	box.OnButtonUp(box.handleButtonUp)
+	box.OnKeyDown(box.handleKeyDown)
+	box.OnKeyUp(box.handleKeyUp)
+	box.SetFocusable(true)
+	return box
+}
+
+// SetText sets the text of the items's label.
+func (this *MenuItem) SetText (text string) {
+	this.label.SetText(text)
+}
+
+// SetIcon sets an icon for this item. Setting the icon to IconUnknown will
+// remove it.
+func (this *MenuItem) SetIcon (id tomo.Icon) {
+	if this.icon != nil { this.Remove(this.icon) }
+	this.Insert(NewIcon(id, tomo.IconSizeSmall), this.label)
+}
+
+// OnClick specifies a function to be called when the menu item is clicked.
+func (this *MenuItem) OnClick (callback func ()) event.Cookie {
+	return this.on.click.Connect(callback)
+}
+
+func (this *MenuItem) handleKeyDown (key input.Key, numberPad bool) bool {
+	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	return true
+}
+
+func (this *MenuItem) handleKeyUp (key input.Key, numberPad bool) bool {
+	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	this.on.click.Broadcast()
+	return true
+}
+
+func (this *MenuItem) handleButtonDown (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	return true
+}
+
+func (this *MenuItem) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	if this.Window().MousePosition().In(this.Bounds()) {
+		this.on.click.Broadcast()
+	}
+	return true
+}
--- a/numberinput.go
+++ b/numberinput.go
@@ -0,0 +1,110 @@
+package objects
+
+import "math"
+import "strconv"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// NumberInput is an editable text box which accepts only numbers, and has
+// controls to increment and decrement its value.
+type NumberInput struct {
+	tomo.ContainerBox
+	input     *TextInput
+	increment *Button
+	decrement *Button
+	on struct {
+		valueChange event.FuncBroadcaster
+		confirm     event.FuncBroadcaster
+	}
+}
+
+// NewNumberInput creates a new number input with the specified value.
+func NewNumberInput (value float64) *NumberInput {
+	box := &NumberInput {
+		ContainerBox: tomo.NewContainerBox(),
+		input:        NewTextInput(""),
+		increment:    NewButton(""),
+		decrement:    NewButton(""),
+	}
+	box.SetRole(tomo.R("objects", "NumberInput"))
+	box.Add(box.input)
+	box.Add(box.decrement)
+	box.Add(box.increment)
+	box.SetAttr(tomo.ALayout(layouts.Row { true, false, false }))
+	box.increment.SetIcon(tomo.IconValueIncrement)
+	box.decrement.SetIcon(tomo.IconValueDecrement)
+	
+	box.SetValue(value)
+	
+	box.OnScroll(box.handleScroll)
+	box.OnKeyDown(box.handleKeyDown)
+	box.OnKeyUp(box.handleKeyUp)
+	box.input.OnConfirm(box.handleConfirm)
+	box.input.OnValueChange(box.on.valueChange.Broadcast)
+	box.increment.OnClick(func () { box.shift(1)  })
+	box.decrement.OnClick(func () { box.shift(-1) })
+	return box
+}
+
+// Value returns the value of the input.
+func (this *NumberInput) Value () float64 {
+	value, _ := strconv.ParseFloat(this.input.Text(), 64)
+	return value
+}
+
+// SetValue sets the value of the input.
+func (this *NumberInput) SetValue (value float64) {
+	this.input.SetText(strconv.FormatFloat(value, 'g', -1, 64))
+}
+
+// OnValueChange specifies a function to be called when the user edits the input
+// value.
+func (this *NumberInput) OnValueChange (callback func ()) event.Cookie {
+	return this.on.valueChange.Connect(callback)
+}
+
+// OnConfirm specifies a function to be called when the user presses enter within
+// the number input.
+func (this *NumberInput) OnConfirm (callback func ()) event.Cookie {
+	return this.on.confirm.Connect(callback)
+}
+
+func (this *NumberInput) shift (by int) {
+	this.SetValue(this.Value() + float64(by))
+	this.on.valueChange.Broadcast()
+}
+
+func (this *NumberInput) handleKeyDown (key input.Key, numpad bool) bool {
+	switch key {
+	case input.KeyUp:
+		this.shift(1)
+		return true
+	case input.KeyDown:
+		this.shift(-1)
+		return true
+	}
+	return false
+}
+
+func (this *NumberInput) handleKeyUp (key input.Key, numpad bool) bool {
+	switch key {
+	case input.KeyUp:   return true
+	case input.KeyDown: return true
+	}
+	return false
+}
+
+func (this *NumberInput) handleScroll (x, y float64) bool {
+	if x == 0 {
+		this.shift(-int(math.Round(y)))
+		return true
+	}
+	return false
+}
+
+func (this *NumberInput) handleConfirm () {
+	this.SetValue(this.Value())
+	this.on.confirm.Broadcast()
+}
--- a/scrollbar.go
+++ b/scrollbar.go
@@ -0,0 +1,394 @@
+package objects
+
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+
+// Scrollbar is a special type of slider that can control the scroll of any
+// overflowing ContainerBox.
+type Scrollbar struct {
+	tomo.ContainerBox
+	handle     *SliderHandle
+	layout     scrollbarLayout
+	dragging   bool
+	dragOffset image.Point
+
+	linkCookie event.Cookie
+
+	on struct {
+		valueChange event.FuncBroadcaster
+	}
+}
+
+func newScrollbar (orient string) *Scrollbar {
+	this := &Scrollbar {
+		ContainerBox: tomo.NewContainerBox(),
+		handle: &SliderHandle {
+			Box: tomo.NewBox(),
+		},
+		layout: scrollbarLayout {
+			vertical: orient == "vertical",
+		},
+	}
+
+	this.Add(this.handle)
+
+	this.SetFocusable(true)
+	this.SetInputMask(true)
+	this.OnKeyUp(this.handleKeyUp)
+	this.OnKeyDown(this.handleKeyDown)
+	this.OnButtonDown(this.handleButtonDown)
+	this.OnButtonUp(this.handleButtonUp)
+	this.OnMouseMove(this.handleMouseMove)
+	this.OnScroll(this.handleScroll)
+	
+	this.handle.SetRole(tomo.R("objects", "SliderHandle"))
+	this.handle.SetTag(orient, true)
+	this.SetRole(tomo.R("objects", "Slider"))
+	this.SetTag(orient, true)
+	return this
+}
+
+// NewVerticalScrollbar creates a new vertical scrollbar.
+func NewVerticalScrollbar () *Scrollbar {
+	return newScrollbar("vertical")
+}
+
+// NewHorizontalScrollbar creates a new horizontal scrollbar.
+func NewHorizontalScrollbar () *Scrollbar {
+	return newScrollbar("horizontal")
+}
+
+// Link assigns this scrollbar to a ContentObject. Closing the returned cookie
+// will unlink it.
+func (this *Scrollbar) Link (box tomo.ContentObject) event.Cookie {
+	this.layout.linked = box
+	this.linkCookie = this.newLinkCookie (
+		box.OnContentBoundsChange(this.handleLinkedContentBoundsChange))
+	this.SetAttr(tomo.ALayout(this.layout))
+	return this.linkCookie
+}
+
+func (this *Scrollbar) handleLinkedContentBoundsChange () {
+	if this.layout.linked == nil { return }
+	previousValue := this.layout.value
+	trackLength := this.layout.contentLength() - this.layout.viewportLength()
+	if trackLength == 0 {
+		this.layout.value = 0
+	} else {
+		this.layout.value = this.layout.contentPos() / trackLength
+	}
+	this.SetAttr(tomo.ALayout(this.layout))
+	if this.layout.value != previousValue {
+		this.on.valueChange.Broadcast()
+	}
+}
+
+// Value returns the value of the scrollbar between 0 and 1 where 0 is scrolled
+// all the way to the left/top, and 1 is scrolled all the way to the
+// right/bottom.
+func (this *Scrollbar) Value () float64 {
+	if this.layout.linked == nil { return 0 }
+	return this.layout.value
+}
+
+// SetValue sets the value of the scrollbar between 0 and 1, where 0 is scrolled
+// all the way to the left/top, and 1 is scrolled all the way to the
+// right/bottom.
+func (this *Scrollbar) SetValue (value float64) {
+	if this.layout.linked == nil { return }
+	if value > 1 { value = 1 }
+	if value < 0 { value = 0 }
+	
+	trackLength := this.layout.contentLength() - this.layout.viewportLength()
+	position    := trackLength * value
+	point       := this.layout.linked.ContentBounds().Min
+	if this.layout.vertical {
+		point.Y = -int(position)
+	} else {
+		point.X = -int(position)
+	}
+	this.layout.linked.ScrollTo(point)
+	
+}
+
+// OnValueChange specifies a function to be called when the user changes the
+// position of the scrollbar.
+func (this *Scrollbar) OnValueChange (callback func ()) event.Cookie {
+	return this.on.valueChange.Connect(callback)
+}
+
+// PageSize returns the scroll distance of a page.
+func (this *Scrollbar) PageSize () int {
+	if this.layout.linked == nil { return 0 }
+	viewport := this.layout.linked.GetBox().InnerBounds()
+	if this.layout.vertical {
+		return viewport.Dy()
+	} else {
+		return viewport.Dx()
+	}
+}
+
+// StepSize returns the scroll distance of a step.
+func (this *Scrollbar) StepSize () int {
+	// FIXME: this should not be hardcoded, need to get base font metrics
+	// from tomo somehow. should be (emspace, lineheight)
+	return 16
+}
+
+func (this *Scrollbar) handleKeyUp (key input.Key, numpad bool) bool {
+	switch key {
+	case input.KeyUp,   input.KeyLeft:  return true
+	case input.KeyDown, input.KeyRight: return true
+	case input.KeyHome: return true
+	case input.KeyEnd:  return true
+	}
+	return false
+}
+
+func (this *Scrollbar) handleKeyDown (key input.Key, numpad bool) bool {
+	var increment float64; if this.layout.vertical {
+		increment = -0.05
+	} else {
+		increment = 0.05
+	}
+
+	modifiers := this.Window().Modifiers()
+
+	switch key {
+	case input.KeyUp, input.KeyLeft:
+		if modifiers.Alt {
+			this.SetValue(0)
+		} else {
+			this.SetValue(this.Value() - increment)
+		}
+		return true
+	case input.KeyDown, input.KeyRight:
+		if modifiers.Alt {
+			this.SetValue(1)
+		} else {
+			this.SetValue(this.Value() + increment)
+		}
+		return true
+	case input.KeyHome:
+		this.SetValue(0)
+		return true
+	case input.KeyEnd:
+		this.SetValue(1)
+		return true
+	}
+	return false
+}
+
+func (this *Scrollbar) handleButtonDown (button input.Button) bool {
+	pointer := this.Window().MousePosition()
+	handle  := this.handle.Bounds()
+
+	within := pointer.In(handle)
+	var above bool; if this.layout.vertical {
+		above = pointer.Y < handle.Min.Y + handle.Dy() / 2
+	} else {
+		above = pointer.X < handle.Min.X + handle.Dx() / 2
+	}
+
+	switch button {
+	case input.ButtonLeft:
+		if within {
+			this.dragging   = true
+			this.dragOffset =
+				pointer.Sub(this.handle.Bounds().Min).
+				Add(this.InnerBounds().Min)
+			this.drag()
+		} else {
+			this.dragOffset = this.fallbackDragOffset()
+			this.dragging   = true
+			this.drag()
+		}
+	case input.ButtonMiddle:
+		if above {
+			this.scrollBy(this.PageSize())
+		} else {
+			this.scrollBy(-this.PageSize())
+		}
+	case input.ButtonRight:
+		if above {
+			this.scrollBy(this.StepSize())
+		} else {
+			this.scrollBy(-this.StepSize())
+		}
+	}
+	return true
+}
+
+func (this *Scrollbar) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft || !this.dragging { return true }
+	this.dragging = false
+	return true
+}
+
+func (this *Scrollbar) handleMouseMove () bool {
+	if !this.dragging { return false }
+	return true
+}
+
+func (this *Scrollbar) handleScroll (x, y float64) bool {
+	if this.layout.linked == nil { return false }
+	this.layout.linked.ScrollTo (
+		this.layout.linked.ContentBounds().Min.
+		Sub(image.Pt(int(x), int(y))))
+	return true
+}
+
+func (this *Scrollbar) drag () {
+	pointer := this.Window().MousePosition().Sub(this.dragOffset)
+	gutter  := this.InnerBounds()
+	handle  := this.handle.Bounds()
+
+	if this.layout.vertical {
+		this.SetValue (
+			float64(pointer.Y) /
+			float64(gutter.Dy() - handle.Dy()))
+	} else {
+		this.SetValue (
+			float64(pointer.X) /
+			float64(gutter.Dx() - handle.Dx()))
+	}
+}
+
+func (this *Scrollbar) fallbackDragOffset () image.Point {
+	if this.layout.vertical {
+		return this.InnerBounds().Min.
+			Add(image.Pt(0, this.handle.Bounds().Dy() / 2))
+	} else {
+		return this.InnerBounds().Min.
+			Add(image.Pt(this.handle.Bounds().Dx() / 2, 0))
+	}
+}
+
+func (this *Scrollbar) scrollBy (distance int) {
+	if this.layout.linked == nil { return }
+	var vector image.Point; if this.layout.vertical {
+		vector.Y = distance
+	} else {
+		vector.X = distance
+	}
+	this.layout.linked.ScrollTo (
+		this.layout.linked.ContentBounds().Min.
+		Add(vector))
+}
+
+type scrollbarCookie struct {
+	owner *Scrollbar
+	subCookies []event.Cookie
+}
+
+func (this *Scrollbar) newLinkCookie (subCookies ...event.Cookie) *scrollbarCookie {
+	return &scrollbarCookie {
+		owner:      this,
+		subCookies: subCookies,
+	}
+}
+
+func (this *scrollbarCookie) Close () {
+	for _, cookie := range this.subCookies {
+		cookie.Close()
+	}
+	this.owner.layout.linked = nil
+	this.owner.SetAttr(tomo.ALayout(this.owner.layout))
+}
+
+type scrollbarLayout struct {
+	vertical bool
+	value    float64
+	linked   tomo.ContentObject
+}
+
+func (scrollbarLayout) MinimumSize (hints tomo.LayoutHints, boxes tomo.BoxQuerier) image.Point {
+	if boxes.Len() != 1 { return image.Pt(0, 0) }
+	return boxes.MinimumSize(0)
+}
+
+func (this scrollbarLayout) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
+	if boxes.Len() != 1 { return }
+	handle := image.Rectangle { Max: boxes.MinimumSize(0) }
+	gutter := hints.Bounds
+
+	var gutterLength float64;
+	var handleMin    float64;
+	if this.vertical {
+		gutterLength = float64(gutter.Dy())
+		handleMin    = float64(handle.Dy())
+	} else {
+		gutterLength = float64(gutter.Dx())
+		handleMin    = float64(handle.Dx())
+	}
+
+	// calculate handle length
+	handleLength := gutterLength * this.viewportContentRatio()
+	if handleLength < handleMin { handleLength = handleMin }
+	if handleLength >= gutterLength {
+		// just hide the handle if it isn't needed. we are the layout
+		// and we shouldn't be adding and removing boxes, so this is
+		// really the only good way to hide things.
+		// TODO perhaps have a "Hidden" rectangle in the Tomo API?
+		boxes.SetBounds(0, image.Rect(-32, -32, -16, -16))
+		return
+	}
+	if this.vertical {
+		handle.Max.Y = int(handleLength)
+	} else {
+		handle.Max.X = int(handleLength)
+	}
+
+	// calculate handle position
+	handlePosition := (gutterLength - handleLength) * this.value
+	var handleOffset image.Point
+	if this.vertical {
+		handleOffset = image.Pt(0, int(handlePosition))
+	} else {
+		handleOffset = image.Pt(int(handlePosition), 0)
+	}
+	handle = handle.Sub(handleOffset).Add(gutter.Min)
+	
+	// place handle
+	boxes.SetBounds(0, handle)
+	
+}
+
+func (this scrollbarLayout) RecommendedHeight (hints tomo.LayoutHints, boxes tomo.BoxQuerier, width int) int {
+	return this.MinimumSize(hints, boxes).X
+}
+
+func (this scrollbarLayout) RecommendedWidth (hints tomo.LayoutHints, boxes tomo.BoxQuerier, height int) int {
+	return this.MinimumSize(hints, boxes).Y
+}
+
+func (this scrollbarLayout) viewportContentRatio () float64 {
+	if this.linked == nil { return 0 }
+	return this.viewportLength() / this.contentLength()
+}
+
+func (this scrollbarLayout) viewportLength () float64 {
+	if this.vertical {
+		return float64(this.linked.GetBox().InnerBounds().Dy())
+	} else {
+		return float64(this.linked.GetBox().InnerBounds().Dx())
+	}
+}
+
+func (this scrollbarLayout) contentLength () float64 {
+	if this.vertical {
+		return float64(this.linked.ContentBounds().Dy())
+	} else {
+		return float64(this.linked.ContentBounds().Dx())
+	}
+}
+
+func (this scrollbarLayout) contentPos () float64 {
+	if this.vertical {
+		return float64(this.linked.ContentBounds().Min.Y)
+	} else {
+		return float64(this.linked.ContentBounds().Min.X)
+	}
+}
--- a/scrollcontainer.go
+++ b/scrollcontainer.go
@@ -0,0 +1,217 @@
+package objects
+
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// ScrollSide determines which Scrollbars are active in a ScrollContainer.
+type ScrollSide int; const (
+	ScrollVertical ScrollSide = 1 << iota
+	ScrollHorizontal
+	ScrollBoth = ScrollVertical | ScrollHorizontal
+)
+
+// Horizontal returns true if the side includes a horizontal bar.
+func (sides ScrollSide) Horizontal () bool {
+	return sides & ScrollHorizontal > 0
+}
+
+// Vertical returns true if the side includes a vertical bar.
+func (sides ScrollSide) Vertical () bool {
+	return sides & ScrollVertical > 0
+}
+
+// String returns one of:
+//   - both
+//   - horizontal
+//   - vertical
+//   - none
+func (sides ScrollSide) String () string {
+	switch {
+	case sides.Horizontal() && sides.Vertical(): return "both"
+	case sides.Horizontal():                     return "horizontal"
+	case sides.Vertical():                       return "vertical"
+	default:                                     return "none"
+	}
+}
+
+// ScrollContainer couples a ContentBox with one or two Scrollbars.
+type ScrollContainer struct {
+	tomo.ContainerBox
+
+	root       tomo.ContentObject
+	horizontal *Scrollbar
+	vertical   *Scrollbar
+	
+	horizontalCookie event.Cookie
+	verticalCookie   event.Cookie
+
+	on struct {
+		valueChange event.FuncBroadcaster
+	}
+}
+
+// NewScrollContainer creates a new scroll container.
+func NewScrollContainer (sides ScrollSide) *ScrollContainer {
+	this := &ScrollContainer {
+		ContainerBox: tomo.NewContainerBox(),
+	}
+	if sides.Vertical() {
+		this.vertical = NewVerticalScrollbar()
+		this.vertical.OnValueChange(this.handleValueChange)
+		this.Add(this.vertical)
+	}
+	if sides.Horizontal() {
+		this.horizontal = NewHorizontalScrollbar()
+		this.horizontal.OnValueChange(this.handleValueChange)
+		this.Add(this.horizontal)
+	}
+	this.OnScroll(this.handleScroll)
+	this.OnKeyDown(this.handleKeyDown)
+	this.OnKeyUp(this.handleKeyUp)
+	this.SetRole(tomo.R("objects", "ScrollContainer"))
+	this.SetTag(sides.String(), true)
+	this.SetAttr(tomo.ALayout(layouts.NewGrid(true, false)(true, false)))
+	return this
+}
+
+// SetRoot sets the root child of the ScrollContainer. There can only be one at
+// a time, and setting it will remove and unlink the current child if there is
+// one.
+func (this *ScrollContainer) SetRoot (root tomo.ContentObject) {
+	if this.root != nil {
+		// remove root and close cookies
+		this.Remove(this.root)
+		if this.horizontalCookie != nil {
+			this.horizontalCookie.Close()
+			this.horizontalCookie = nil
+		}
+		if this.verticalCookie != nil {
+			this.verticalCookie.Close()
+			this.verticalCookie = nil
+		}
+	}
+	this.root = root
+	if root != nil {
+		// insert root at the beginning (for keynav)
+		switch {
+		case this.vertical != nil:
+			this.Insert(root, this.vertical)
+		case this.horizontal != nil:
+			this.Insert(root, this.horizontal)
+		default:
+			this.Add(root)
+		}
+		
+		// link root and remember cookies
+		if this.horizontal != nil {
+			this.horizontalCookie = this.horizontal.Link(root)
+		}
+		if this.vertical != nil {
+			this.verticalCookie =  this.vertical.Link(root)
+		}
+	}
+}
+
+// Value returns the horizontal and vertical scrollbar values where 0 is all the
+// way to the left/top, and 1 is all the way to the right/bottom.
+func (this *ScrollContainer) Value () (x, y float64) {
+	if this.horizontal != nil {
+		x = this.horizontal.Value()
+	}
+	if this.vertical != nil {
+		y = this.vertical.Value()
+	}
+	return x, y
+}
+
+// SetValue sets the horizontal and vertical scrollbar values where 0 is all the
+// way to the left/top, and 1 is all the way to the right/bottom.
+func (this *ScrollContainer) SetValue (x, y float64) {
+	if this.horizontal != nil {
+		this.horizontal.SetValue(x)
+	}
+	if this.vertical != nil {
+		this.vertical.SetValue(y)
+	}
+}
+
+// OnValueChange specifies a function to be called when the user changes the
+// position of the horizontal or vertical scrollbars.
+func (this *ScrollContainer) OnValueChange (callback func ()) event.Cookie {
+	return this.on.valueChange.Connect(callback)
+}
+
+// PageSize returns the scroll distance of a page.
+func (this *ScrollContainer) PageSize () image.Point {
+	page := image.Point { }
+	if this.horizontal != nil {
+		page.X = this.horizontal.PageSize()
+	}
+	if this.vertical != nil {
+		page.Y = this.vertical.PageSize()
+	}
+	return page
+}
+
+// StepSize returns the scroll distance of a step.
+func (this *ScrollContainer) StepSize () image.Point {
+	page := image.Point { }
+	if this.horizontal != nil {
+		page.X = this.horizontal.StepSize()
+	}
+	if this.vertical != nil {
+		page.Y = this.vertical.StepSize()
+	}
+	return page
+}
+
+func (this *ScrollContainer) handleValueChange () {
+	this.on.valueChange.Broadcast()
+}
+
+func (this *ScrollContainer) scrollBy (vector image.Point) {
+	if this.root == nil               { return }
+	if vector    == (image.Point { }) { return }
+	this.root.ScrollTo (
+		this.root.ContentBounds().Min.
+		Sub(vector))
+}
+
+func (this *ScrollContainer) handleScroll (x, y float64) bool {
+	if this.root == nil { return false }
+	this.scrollBy(image.Pt(int(x), int(y)))
+	return true
+}
+
+func (this *ScrollContainer) handleKeyDown (key input.Key, numpad bool) bool {
+	modifiers := this.Window().Modifiers()
+	vector    := image.Point { }
+	switch key {
+	case input.KeyPageUp:
+		if modifiers.Shift {
+			vector.X -= this.PageSize().X
+		} else {
+			vector.Y -= this.PageSize().Y
+		}
+		return true
+	case input.KeyPageDown:
+		if modifiers.Shift {
+			vector.X += this.PageSize().X
+		} else {
+			vector.Y += this.PageSize().Y
+		}
+		return true
+	}
+	return false
+}
+
+func (this *ScrollContainer) handleKeyUp (key input.Key, numpad bool) bool {
+	switch key {
+	case input.KeyPageUp:   return true
+	case input.KeyPageDown: return true
+	}
+	return false
+}
--- a/separator.go
+++ b/separator.go
@@ -1,7 +1,6 @@
 package objects

 import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/tomo/theme"

 // Separator is a line for visually separating elements.
 type Separator struct {
@@ -13,7 +12,6 @@ func NewSeparator () *Separator {
 	this := &Separator {
 		Box: tomo.NewBox(),
 	}
-	theme.Apply(this, theme.R("objects", "Separator", ""))
+	this.SetRole(tomo.R("objects", "Separator"))
 	return this
 }
-
--- a/slider.go
+++ b/slider.go
@@ -1,25 +1,28 @@
 package objects

+import "math"
 import "image"
 import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/tomo/theme"
 import "git.tebibyte.media/tomo/tomo/input"
 import "git.tebibyte.media/tomo/tomo/event"

-// UNDER CONSTRUCTION!
-
+// Slider is a control that selects a numeric value between 0 and 1.
 type Slider struct {
 	tomo.ContainerBox
 	handle     *SliderHandle
 	layout     sliderLayout
 	dragging   bool
 	dragOffset image.Point
-	
+	step       float64
+
 	on struct {
 		valueChange event.FuncBroadcaster
+		confirm     event.FuncBroadcaster
 	}
 }

+// SliderHandle is a simple object that serves as a handle for sliders and
+// scrollbars. It is completely inert.
 type SliderHandle struct {
 	tomo.Box
 }
@@ -32,81 +35,123 @@ func newSlider (orient string, value float64) *Slider {
 		},
 		layout: sliderLayout {
 			vertical: orient == "vertical",
+			value:    math.NaN(),
 		},
+		step: 0.05,
 	}
-	
+
 	this.Add(this.handle)
 	this.SetFocusable(true)
-	this.SetPropagateEvents(false)
 	this.SetValue(value)
+
+	this.SetInputMask(true)
+	this.OnKeyUp(this.handleKeyUp)
 	this.OnKeyDown(this.handleKeyDown)
-	this.OnMouseDown(this.handleMouseDown)
-	this.OnMouseUp(this.handleMouseUp)
+	this.OnButtonDown(this.handleButtonDown)
+	this.OnButtonUp(this.handleButtonUp)
 	this.OnMouseMove(this.handleMouseMove)
-	theme.Apply(this.handle, theme.R("objects", "SliderHandle", orient))
-	theme.Apply(this,        theme.R("objects", "Slider", orient))
+	this.OnScroll(this.handleScroll)
+	
+	this.handle.SetRole(tomo.R("objects", "SliderHandle"))
+	this.handle.SetTag(orient, true)
+	this.SetRole(tomo.R("objects", "Slider"))
+	this.SetTag(orient, true)
 	return this
 }

+// NewVerticalSlider creates a new vertical slider with the specified value.
 func NewVerticalSlider (value float64) *Slider {
 	return newSlider("vertical", value)
 }

+// NewHorizontalSlider creates a new horizontal slider with the specified value.
 func NewHorizontalSlider (value float64) *Slider {
 	return newSlider("horizontal", value)
 }

+// SetValue sets the value of the slider between 0 and 1.
 func (this *Slider) SetValue (value float64) {
 	if value < 0 { value = 0 }
 	if value > 1 { value = 1 }
 	if value == this.layout.value { return }
 	this.layout.value = value
-	this.SetLayout(this.layout)
-	this.on.valueChange.Broadcast()
+	this.SetAttr(tomo.ALayout(this.layout))
 }

+// Value returns the value of the slider between 0 and 1.
 func (this *Slider) Value () float64 {
 	return this.layout.value
 }

+// OnValueChange specifies a function to be called when the user moves the
+// slider.
 func (this *Slider) OnValueChange (callback func ()) event.Cookie {
 	return this.on.valueChange.Connect(callback)
 }

-func (this *Slider) handleKeyDown (key input.Key, numpad bool) {
-	switch key {
-	case input.KeyUp, input.KeyLeft:
-		if this.Modifiers().Alt {
-			this.SetValue(0)
-		} else {
-			this.SetValue(this.Value() - 0.05)		
-		}
-	case input.KeyDown, input.KeyRight:
-		if this.Modifiers().Alt {
-			this.SetValue(1)
-		} else {
-			this.SetValue(this.Value() + 0.05)		
-		}
-	case input.KeyHome:
-		this.SetValue(0)
-	case input.KeyEnd:
-		this.SetValue(1)
-	}
+// OnConfirm specifies a function to be called when the user stops moving the
+// slider.
+func (this *Slider) OnConfirm (callback func ()) event.Cookie {
+	return this.on.confirm.Connect(callback)
 }

-func (this *Slider) handleMouseDown (button input.Button) {
-	pointer := this.MousePosition()
-	handle  := this.handle.Bounds()
-	var above, within bool
-	
-	if pointer.In(handle) {
-		within = true
-	} else if this.layout.vertical {
-		above = pointer.Y < handle.Min.Y
+func (this *Slider) handleKeyDown (key input.Key, numpad bool) bool {
+	var increment float64; if this.layout.vertical {
+		increment = -0.05
 	} else {
-		above = pointer.X < handle.Min.X
+		increment = 0.05
 	}
+
+	switch key {
+	case input.KeyUp, input.KeyLeft:
+		if this.Window().Modifiers().Alt {
+			this.SetValue(0)
+		} else {
+			this.SetValue(this.Value() - increment)
+		}
+		this.on.valueChange.Broadcast()
+		return true
+	case input.KeyDown, input.KeyRight:
+		if this.Window().Modifiers().Alt {
+			this.SetValue(1)
+		} else {
+			this.SetValue(this.Value() + increment)
+		}
+		this.on.valueChange.Broadcast()
+		return true
+	case input.KeyHome:
+		this.SetValue(0)
+		this.on.valueChange.Broadcast()
+		return true
+	case input.KeyEnd:
+		this.SetValue(1)
+		this.on.valueChange.Broadcast()
+		return true
+	}
+	return false
+}
+
+func (this *Slider) handleKeyUp (key input.Key, numpad bool) bool {
+	switch key {
+	case input.KeyUp,   input.KeyLeft:  return true
+	case input.KeyDown, input.KeyRight: return true
+	case input.KeyHome: return true
+	case input.KeyEnd:  return true
+	}
+	return false
+}
+
+func (this *Slider) handleButtonDown (button input.Button) bool {
+	pointer := this.Window().MousePosition()
+	handle  := this.handle.Bounds()
 	
+	within := pointer.In(handle)
+	var above bool; if this.layout.vertical {
+		above = pointer.Y < handle.Min.Y + handle.Dy() / 2
+	} else {
+		above = pointer.X < handle.Min.X + handle.Dx() / 2
+	}
+
 	switch button {
 	case input.ButtonLeft:
 		if within {
@@ -123,35 +168,56 @@ func (this *Slider) handleMouseDown (button input.Button) {
 	case input.ButtonMiddle:
 		if above {
 			this.SetValue(0)
+			this.on.valueChange.Broadcast()
+			this.on.confirm.Broadcast()
 		} else {
 			this.SetValue(1)
+			this.on.valueChange.Broadcast()
+			this.on.confirm.Broadcast()
 		}
 	case input.ButtonRight:
 		if above {
-			this.SetValue(this.Value() - 0.05)
+			this.SetValue(this.Value() - this.step)
+			this.on.valueChange.Broadcast()
+			this.on.confirm.Broadcast()
 		} else {
-			this.SetValue(this.Value() + 0.05)
+			this.SetValue(this.Value() + this.step)
+			this.on.valueChange.Broadcast()
+			this.on.confirm.Broadcast()
 		}
 	}
+	return true
 }

-func (this *Slider) handleMouseUp (button input.Button) {
-	if button != input.ButtonLeft || !this.dragging { return }
+func (this *Slider) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft || !this.dragging { return true }
 	this.dragging = false
+	this.on.confirm.Broadcast()
+	return true
 }

-func (this *Slider) handleMouseMove () {
-	if !this.dragging { return }
+func (this *Slider) handleMouseMove () bool {
+	if !this.dragging { return false }
 	this.drag()
+	return true
+}
+
+func (this *Slider) handleScroll (x, y float64) bool {
+	delta := (x + y) * 0.005
+	this.SetValue(this.Value() + delta)
+	this.on.valueChange.Broadcast()
+	this.on.confirm.Broadcast()
+	return true
 }

 func (this *Slider) drag () {
-	pointer := this.MousePosition().Sub(this.dragOffset)
+	pointer := this.Window().MousePosition().Sub(this.dragOffset)
 	gutter  := this.InnerBounds()
 	handle  := this.handle.Bounds()

 	if this.layout.vertical {
 		this.SetValue (
+			1 -
 			float64(pointer.Y) /
 			float64(gutter.Dy() - handle.Dy()))
 	} else {
@@ -159,6 +225,7 @@ func (this *Slider) drag () {
 			float64(pointer.X) /
 			float64(gutter.Dx() - handle.Dx()))
 	}
+	this.on.valueChange.Broadcast()
 }

 func (this *Slider) fallbackDragOffset () image.Point {
@@ -176,31 +243,37 @@ type sliderLayout struct {
 	value    float64
 }

-func (sliderLayout) MinimumSize (hints tomo.LayoutHints, boxes []tomo.Box) image.Point {
-	if len(boxes) != 1 { return image.Pt(0, 0) }
-	return boxes[0].MinimumSize()
+func (sliderLayout) MinimumSize (hints tomo.LayoutHints, boxes tomo.BoxQuerier) image.Point {
+	if boxes.Len() != 1 { return image.Pt(0, 0) }
+	return boxes.MinimumSize(0)
 }

-func (this sliderLayout) Arrange (hints tomo.LayoutHints, boxes []tomo.Box) {
-	if len(boxes) != 1 { return }
-	handle := image.Rectangle { Max: boxes[0].MinimumSize() }
+func (this sliderLayout) Arrange (hints tomo.LayoutHints, boxes tomo.BoxArranger) {
+	if boxes.Len() != 1 { return }
+	handle := image.Rectangle { Max: boxes.MinimumSize(0) }
 	gutter := hints.Bounds
-	
+
 	if this.vertical {
 		height := gutter.Dy() - handle.Dy()
-		offset := int(float64(height) * this.value)
-		gutter.Max.X = handle.Max.X
-		boxes[0].SetBounds (
-			handle.
-			Add(image.Pt(0, offset)).
-			Add(gutter.Min))
+		offset := int(float64(height) * (1 - this.value))
+		handle.Max.X = gutter.Dx()
+		boxes.SetBounds (
+			0,
+			handle.Add(image.Pt(0, offset)).Add(gutter.Min))
 	} else {
 		width  := gutter.Dx() - handle.Dx()
 		offset := int(float64(width) * this.value)
-		gutter.Max.Y = handle.Max.Y
-		boxes[0].SetBounds (
-			handle.
-			Add(image.Pt(offset, 0)).
-			Add(gutter.Min))
+		handle.Max.Y = gutter.Dy()
+		boxes.SetBounds (
+			0,
+			handle.Add(image.Pt(offset, 0)).Add(gutter.Min))
 	}
 }
+
+func (this sliderLayout) RecommendedHeight (hints tomo.LayoutHints, boxes tomo.BoxQuerier, width int) int {
+	return this.MinimumSize(hints, boxes).X
+}
+
+func (this sliderLayout) RecommendedWidth (hints tomo.LayoutHints, boxes tomo.BoxQuerier, height int) int {
+	return this.MinimumSize(hints, boxes).Y
+}
--- a/swatch.go
+++ b/swatch.go
@@ -0,0 +1,182 @@
+package objects
+
+import "log"
+import "image"
+import "image/color"
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/tomo/event"
+import "git.tebibyte.media/tomo/tomo/canvas"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+// Swatch displays a color, allowing the user to edit it by clicking on it.
+type Swatch struct {
+	tomo.CanvasBox
+	value color.Color
+	editing bool
+	label string
+	on struct {
+		valueChange event.FuncBroadcaster
+		confirm     event.FuncBroadcaster
+	}
+}
+
+// NewSwatch creates a new swatch with the given color.
+func NewSwatch (value color.Color) *Swatch {
+	swatch := &Swatch {
+		CanvasBox: tomo.NewCanvasBox(),
+	}
+	swatch.SetRole(tomo.R("objects", "Swatch"))
+	swatch.SetDrawer(swatch)
+	swatch.SetValue(value)
+	
+	swatch.OnButtonDown(swatch.handleButtonDown)
+	swatch.OnButtonUp(swatch.handleButtonUp)
+	swatch.OnKeyDown(swatch.handleKeyDown)
+	swatch.OnKeyUp(swatch.handleKeyUp)
+	swatch.SetFocusable(true)
+	return swatch
+}
+
+// Value returns the color of the swatch.
+func (this *Swatch) Value () color.Color {
+	return this.value
+}
+
+// SetValue sets the color of the swatch.
+func (this *Swatch) SetValue (value color.Color) {
+	this.value = value
+	if value == nil { value = color.Transparent }
+	this.Invalidate()
+}
+
+// OnValueChange specifies a function to be called when the swatch's color
+// is changed by the user.
+func (this *Swatch) OnValueChange (callback func ()) event.Cookie {
+	return this.on.valueChange.Connect(callback)
+}
+
+// RGBA satisfies the color.Color interface
+func (this *Swatch) RGBA () (r, g, b, a uint32) {
+	if this.value == nil { return }
+	return this.value.RGBA()
+}
+
+// OnConfirm specifies a function to be called when the user selects "OK" in the
+// color picker.
+func (this *Swatch) OnConfirm (callback func ()) event.Cookie {
+	return this.on.confirm.Connect(callback)
+}
+
+// Choose creates a modal that allows the user to edit the color of the swatch.
+func (this *Swatch) Choose () {
+	if this.editing { return }
+
+	var err    error
+	var window tomo.Window
+	if parent := this.Window(); parent != nil {
+		window, err = parent.NewChild(image.Rectangle { })
+	} else {
+		window, err = tomo.NewWindow(image.Rectangle { })
+	}
+	if err != nil {
+		log.Println("objects: could not create swatch modal:", err)
+		return
+	}
+	if this.label == "" {
+		window.SetTitle("Select Color")
+	} else {
+		window.SetTitle(this.label)
+	}
+	
+	committed := false
+	
+	colorPicker := NewColorPicker(this.Value())
+	colorPicker.OnValueChange(func () {
+		this.userSetValue(colorPicker.Value())
+	})
+	
+	hexInput := NewTextInput("TODO")
+	
+	colorMemory  := this.value
+	cancelButton := NewButton("Cancel")
+	cancelButton.SetIcon(tomo.IconDialogCancel)
+	cancelButton.OnClick(func () {
+		window.Close()
+	})
+	okButton := NewButton("OK")
+	okButton.SetFocused(true)
+	okButton.SetIcon(tomo.IconDialogOkay)
+	okButton.OnClick(func () {
+		committed = true
+		window.Close()
+	})
+	
+	controlRow := NewInnerContainer (
+		layouts.ContractHorizontal,
+		cancelButton,
+		okButton)
+	controlRow.SetAttr(tomo.AAlign(tomo.AlignEnd, tomo.AlignMiddle))
+	window.SetRoot(NewOuterContainer (
+		layouts.Column { true, false },
+		colorPicker,
+		NewInnerContainer(layouts.Row { false, true },
+			NewLabel("Hex"),
+			hexInput),
+		controlRow))
+	window.OnClose(func () {
+		if committed {
+			this.on.confirm.Broadcast()
+		} else {
+			this.userSetValue(colorMemory)
+		}
+		this.editing = false
+	})
+	this.editing = true
+	window.SetVisible(true)
+}
+
+func (this *Swatch) Draw (can canvas.Canvas) {
+	pen := can.Pen()
+	
+	// transparency slash
+	pen.Stroke(color.RGBA { R: 255, A: 255 })
+	pen.StrokeWeight(1)
+	pen.Path(this.Bounds().Min, this.Bounds().Max)
+	
+	// color
+	if this.value != nil {
+		pen.StrokeWeight(0)
+		pen.Fill(this.value)
+		pen.Rectangle(this.Bounds())
+	}
+}
+
+func (this *Swatch) userSetValue (value color.Color) {
+	this.SetValue(value)
+	this.on.valueChange.Broadcast()
+}
+
+func (this *Swatch) handleKeyDown (key input.Key, numberPad bool) bool {
+	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	return true
+}
+
+func (this *Swatch) handleKeyUp (key input.Key, numberPad bool) bool {
+	if key != input.KeyEnter && key != input.Key(' ') { return false }
+	this.Choose()
+	return true
+}
+
+func (this *Swatch) handleButtonDown (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	return true
+}
+
+func (this *Swatch) handleButtonUp (button input.Button) bool {
+	if button != input.ButtonLeft { return false }
+	if this.Window().MousePosition().In(this.Bounds()) {
+		this.Choose()
+	}
+	return true
+}
--- a/tabbedcontainer.go
+++ b/tabbedcontainer.go
@@ -0,0 +1,135 @@
+package objects
+
+import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/tomo/input"
+import "git.tebibyte.media/tomo/objects/layouts"
+
+type TabbedContainer struct {
+	tomo.ContainerBox
+	
+	leftSpacer  tomo.Box
+	rightSpacer tomo.Box
+	tabsRow tomo.ContainerBox
+	active string
+	tabs []*tab
+}
+
+func NewTabbedContainer () *TabbedContainer {
+	container := &TabbedContainer {
+		ContainerBox: tomo.NewContainerBox(),
+	}
+	container.SetRole(tomo.R("objects", "TabbedContainer"))
+	container.SetAttr(tomo.ALayout(layouts.Column { false, true }))
+	
+	container.tabsRow = tomo.NewContainerBox()
+	container.tabsRow.SetRole(tomo.R("objects", "TabRow"))
+	container.Add(container.tabsRow)
+	
+	container.leftSpacer = tomo.NewBox()
+	container.leftSpacer.SetRole(tomo.R("objects", "TabSpacer"))
+	container.leftSpacer.SetTag("left", true)
+	container.rightSpacer = tomo.NewBox()
+	container.rightSpacer.SetRole(tomo.R("objects", "TabSpacer"))
+	container.rightSpacer.SetTag("left", true)
+	
+	container.ClearTabs()
+	container.setTabRowLayout()
+	return container
+}
+
+func (this *TabbedContainer) Activate (name string) {
+	if _, tab := this.findTab(this.active); tab != nil {
+		tab.setActive(false)
+		this.Remove(tab.root)
+	}
+	if _, tab := this.findTab(name); tab != nil {
+		tab.setActive(true)
+		this.Add(tab.root)
+	} else {
+		name = ""
+	}
+	this.active = name
+}
+
+func (this *TabbedContainer) AddTab (name string, root tomo.Object) {
+	tab := &tab {
+		TextBox: tomo.NewTextBox(),
+		name:    name,
+		root:    root,
+	}
+	tab.SetRole(tomo.R("objects", "Tab"))
+	tab.SetText(name)
+	tab.OnButtonDown(func (button input.Button) bool {
+		if button != input.ButtonLeft { return false }
+		this.Activate(name)
+		return true
+	})
+	tab.OnButtonUp(func (button input.Button) bool {
+		if button != input.ButtonLeft { return false }
+		return true
+	})
+	
+	this.tabs = append(this.tabs, tab)
+	this.tabsRow.Insert(tab, this.rightSpacer)
+	this.setTabRowLayout()
+	
+	// if the row was empty before, activate this tab
+	if len(this.tabs) == 1 {
+		this.Activate(name)	
+	}
+}
+
+func (this *TabbedContainer) RemoveTab (name string) {
+	index, tab := this.findTab(name)
+	if index < 0 { return }
+	nextIndex := index - 1
+	
+	this.tabsRow.Remove(tab)
+	this.tabs = append(this.tabs[:index], this.tabs[index - 1:]...)
+	this.setTabRowLayout()
+	
+	if nextIndex < 0               { nextIndex = 0 }
+	if nextIndex >= len(this.tabs) { nextIndex = len(this.tabs) - 1 }
+	if nextIndex < 0 {
+		this.Activate("")
+	} else {
+		this.Activate(this.tabs[nextIndex].name)
+	}
+}
+
+func (this *TabbedContainer) ClearTabs () {
+	this.tabs = nil
+	this.tabsRow.Clear()
+	this.tabsRow.Add(this.leftSpacer)
+	this.tabsRow.Add(this.rightSpacer)
+}
+
+func (this *TabbedContainer) setTabRowLayout () {
+	row := make(layouts.Row, 1 + len(this.tabs) + 1)
+	row[len(row) - 1] = true
+	this.tabsRow.SetAttr(tomo.ALayout(row))
+}
+
+func (this *TabbedContainer) findTab (name string) (int, *tab) {
+	for index, tab := range this.tabs {
+		if tab.name == name { return index, tab }
+	}
+	return -1, nil
+}
+
+type tab struct {
+	tomo.TextBox
+	name string
+	root tomo.Object
+}
+
+func (this *tab) setActive (active bool) {
+	if active {
+		this.SetRole(tomo.R("objects", "Tab"))
+		this.SetTag("active", false)
+	} else {
+		this.SetRole(tomo.R("objects", "Tab"))
+		this.SetTag("active", true)
+	}
+}
+
--- a/textinput.go
+++ b/textinput.go
@@ -1,8 +1,8 @@
 package objects

+import "image"
 import "git.tebibyte.media/tomo/tomo"
 import "git.tebibyte.media/tomo/tomo/text"
-import "git.tebibyte.media/tomo/tomo/theme"
 import "git.tebibyte.media/tomo/tomo/input"
 import "git.tebibyte.media/tomo/tomo/event"

@@ -11,18 +11,23 @@ type TextInput struct {
 	tomo.TextBox
 	text []rune
 	on struct {
-		enter event.FuncBroadcaster
+		valueChange event.FuncBroadcaster
+		confirm     event.FuncBroadcaster
 	}
 }

 // NewTextInput creates a new text input containing the specified text.
 func NewTextInput (text string) *TextInput {
 	this := &TextInput { TextBox: tomo.NewTextBox() }
-	theme.Apply(this, theme.R("objects", "TextInput", ""))
+	this.SetRole(tomo.R("objects", "TextInput"))
+	this.SetAttr(tomo.AAlign(tomo.AlignStart, tomo.AlignMiddle))
+	this.SetAttr(tomo.AOverflow(true, false))
 	this.SetText(text)
 	this.SetFocusable(true)
 	this.SetSelectable(true)
 	this.OnKeyDown(this.handleKeyDown)
+	this.OnKeyUp(this.handleKeyUp)
+	this.OnScroll(this.handleScroll)
 	return this
 }

@@ -37,22 +42,39 @@ func (this *TextInput) Text () string {
 	return string(this.text)
 }

-// OnEnter specifies a function to be called when the user presses enter within
-// the text input.
-func (this *TextInput) OnEnter (callback func ()) event.Cookie {
-	return this.on.enter.Connect(callback)
+// OnConfirm specifies a function to be called when the user presses enter
+// within the text input.
+func (this *TextInput) OnConfirm (callback func ()) event.Cookie {
+	return this.on.confirm.Connect(callback)
 }

-func (this *TextInput) handleKeyDown (key input.Key, numpad bool) {
+// OnValueChange specifies a function to be called when the user edits the input
+// text.
+func (this *TextInput) OnValueChange (callback func ()) event.Cookie {
+	return this.on.valueChange.Connect(callback)
+}
+
+// Type types a character at the current dot position.
+func (this *TextInput) Type (char rune) {
+	dot := this.Dot()
+	this.text, dot = text.Type(this.text, dot, rune(char))
+	this.Select(dot)
+	this.SetText(string(this.text))
+}
+
+func (this *TextInput) handleKeyDown (key input.Key, numpad bool) bool {
 	dot       := this.Dot()
-	modifiers := this.Modifiers()
+	modifiers := this.Window().Modifiers()
 	word      := modifiers.Control
 	sel       := modifiers.Shift
 	changed   := false
-	
+
+	// TODO all dot control (movement, selection, etc) should be done in the
+	// backend. (editing should be done here, though)
+
 	switch {
 	case key == input.KeyEnter:
-		this.on.enter.Broadcast()
+		this.on.confirm.Broadcast()
 	case key == input.KeyHome || (modifiers.Alt && key == input.KeyLeft):
 		dot.End = 0
 		if !sel { dot.Start = dot.End }
@@ -84,7 +106,20 @@ func (this *TextInput) handleKeyDown (key input.Key, numpad bool) {
 		this.text, dot = text.Type(this.text, dot, rune(key))
 		changed = true
 	}
-	
+
 	this.Select(dot)
-	if changed { this.SetText(string(this.text)) }
+	if changed {
+		this.SetText(string(this.text))
+		this.on.valueChange.Broadcast()
+	}
+	return true
+}
+
+func (this *TextInput) handleKeyUp (key input.Key, numpad bool) bool {
+	return true
+}
+
+func (this *TextInput) handleScroll (x, y float64) bool {
+	this.ScrollTo(this.ContentBounds().Min.Add(image.Pt(int(x), int(y))))
+	return true
 }
--- a/textview.go
+++ b/textview.go
@@ -0,0 +1,27 @@
+package objects
+
+import "image"
+import "git.tebibyte.media/tomo/tomo"
+
+// TextView is an area for displaying a large amount of multi-line text.
+type TextView struct {
+	tomo.TextBox
+}
+
+// NewTextView creates a new text view.
+func NewTextView (text string) *TextView {
+	this := &TextView { TextBox: tomo.NewTextBox() }
+	this.SetRole(tomo.R("objects", "TextView"))
+	this.SetFocusable(true)
+	this.SetSelectable(true)
+	this.SetText(text)
+	this.SetAttr(tomo.AOverflow(false, true))
+	this.SetAttr(tomo.AWrap(true))
+	this.OnScroll(this.handleScroll)
+	return this
+}
+
+func (this *TextView) handleScroll (x, y float64) bool {
+	this.ScrollTo(this.ContentBounds().Min.Add(image.Pt(int(x), int(y))))
+	return true
+}
Author	SHA1	Message	Date
Sasha Koshka	85fbe9c996	Update code for objects	2024-07-25 12:58:38 -04:00
Sasha Koshka	25a59d888c	Update Tomo API to v0.41.0	2024-07-25 12:55:03 -04:00
Sasha Koshka	6ca6771fc6	Update code for layouts, objects	2024-07-21 11:48:28 -04:00
Sasha Koshka	9077015db6	Update Tomo API	2024-07-21 11:48:06 -04:00
Sasha Koshka	1125d98b3d	Change OnEnter to OnConfirm Full remediation of #6	2024-06-27 14:09:58 -04:00
Sasha Koshka	638fc61d83	Make value getters/setters more consistent See #6	2024-06-27 14:01:14 -04:00
sashakoshka@tebibyte.media	d0ee6c432c	Add OnEnter to Swatch and ColorPicker	2024-06-26 11:20:53 -04:00
sashakoshka@tebibyte.media	b9f980e7fd	Fix doc comment on MenuItem	2024-06-25 02:33:36 -04:00
sashakoshka@tebibyte.media	b7d1a0abdd	Add OnEnter for Slider	2024-06-25 02:33:13 -04:00
sashakoshka@tebibyte.media	a38cee8437	Fix RGBAToHSVA	2024-06-25 02:32:00 -04:00
sashakoshka@tebibyte.media	48bfa05452	Color editing popups use swatch label for title	2024-06-22 18:48:54 -04:00
sashakoshka@tebibyte.media	e8a3a376ea	Introduce new layouts.Grid construct	2024-06-22 18:44:26 -04:00
sashakoshka@tebibyte.media	ae1e62c1f2	Add swatch	2024-06-22 15:44:37 -04:00
sashakoshka@tebibyte.media	0b7e5392f4	Add color picker	2024-06-22 15:44:24 -04:00
sashakoshka@tebibyte.media	1efb946953	Fix issues with grid layout	2024-06-22 15:38:52 -04:00
sashakoshka@tebibyte.media	1e8df2392d	Add tabs	2024-06-22 15:38:14 -04:00
sashakoshka@tebibyte.media	83dca60257	Fix checkboxes not initializing to desired value	2024-06-22 15:37:52 -04:00
sashakoshka@tebibyte.media	5b60717b8f	Add an HSVA color implementation	2024-06-22 15:37:20 -04:00
sashakoshka@tebibyte.media	d01d39569b	Sliders work properly when initialized to 0.0	2024-06-20 17:48:41 -04:00
sashakoshka@tebibyte.media	55637e36db	Lables come vertically aligned to the middle	2024-06-20 17:47:51 -04:00
sashakoshka@tebibyte.media	e62afcd667	Fix calendar prev/forward month buttons	2024-06-19 00:38:54 -04:00
sashakoshka@tebibyte.media	f778ef5c95	Add calendar widget	2024-06-18 19:37:37 -04:00
sashakoshka@tebibyte.media	c06f10c193	Fix flow layout getting stuck in a loop	2024-06-15 18:12:08 -04:00
sashakoshka@tebibyte.media	23fb28ce5c	Some internal layouts return recommended sizes	2024-06-15 09:27:35 -04:00
sashakoshka@tebibyte.media	3533ce3726	Row/Column uses correct axis for determining free space	2024-06-15 07:58:51 -04:00
sashakoshka@tebibyte.media	6d157eb9af	Fix Column layout not allocating space to expanding boxes	2024-06-15 07:54:49 -04:00
Sasha Koshka	da346f2f12	Row, Column have recommended size support	2024-06-12 03:35:38 -04:00
Sasha Koshka	71a41d390f	Row, Column handle expansion properly	2024-06-12 03:32:32 -04:00
Sasha Koshka	9ce7f8b8f3	Contract layouts are now based on new Row and Column layouts	2024-06-12 03:15:38 -04:00
Sasha Koshka	1596d54834	Fix up objects code	2024-06-11 17:17:11 -04:00
Sasha Koshka	95d3dc3288	Add placeholder methods for recommended sizes	2024-06-11 17:12:18 -04:00
Sasha Koshka	1069ae6455	Removed cut layout Not a very good implementation	2024-06-11 16:58:38 -04:00
Sasha Koshka	5c8358fc4a	Add blank vars to ensure layouts satisfy tomo.Layout	2024-06-11 16:46:04 -04:00
Sasha Koshka	6a8aaca18d	Rename layouts.go -> contract.go	2024-06-11 16:44:15 -04:00
Sasha Koshka	460733c8f3	Update code for objects	2024-06-11 16:40:35 -04:00
Sasha Koshka	5d2a366a62	Update Tomo API	2024-06-11 16:40:06 -04:00
Sasha Koshka	2c7c77d8da	Add menus	2024-06-07 01:59:29 -04:00
Sasha Koshka	8139d871cc	Text-less buttons place their icon in the middle	2024-06-07 01:58:29 -04:00
Sasha Koshka	bb320dfcc9	Update Tomo API	2024-06-07 01:58:09 -04:00
Sasha Koshka	2ab920eb26	Store role in Boxes	2024-06-03 21:13:18 -04:00
Sasha Koshka	d8ae20d739	Update Tomo API	2024-06-03 21:10:20 -04:00
Sasha Koshka	06561bb671	Scrollbar, ScrollContainer use ContentObject now	2024-05-27 16:28:48 -04:00
Sasha Koshka	a71d81af48	Checkbox uses CheckboxUnchecked icon when unchecked	2024-05-27 15:59:24 -04:00
Sasha Koshka	bd9dbb762d	Update Tomo API	2024-05-27 15:22:18 -04:00
Sasha Koshka	6389556199	Updated all objects to new API	2024-05-26 17:21:58 -04:00
Sasha Koshka	06d99b2790	Update Tomo API	2024-05-26 17:13:40 -04:00
Sasha Koshka	6ab689b5c1	Renamed input.go to textinput.go	2024-05-20 02:23:07 -04:00
Sasha Koshka	6497da69ed	LabelCheckbox no longer expands vertically It should in theory valign to middle this way, but grid layout suffers from #1	2024-05-18 14:18:02 -04:00
Sasha Koshka	34794f4c77	Make the dialog API more normal It was very nice but inconsistent with literally everything else, and never in my life have I seen someone else make a constructor that way.	2024-05-18 14:16:57 -04:00
Sasha Koshka	25625e9a99	Add dialog boxes	2024-05-18 13:25:06 -04:00
Sasha Koshka	4cea0aa0bd	Flow layout no longer leaves last box behind	2024-05-17 14:43:06 -04:00
Sasha Koshka	1cb9e8091e	Combine Row/Column layouts into Contract layout	2024-05-17 03:56:49 -04:00
Sasha Koshka	68d49e1b02	Add flow layout	2024-05-17 03:51:24 -04:00
Sasha Koshka	f025ec3d8a	Slider can now be controlled by scrolling If ya nasty	2024-05-17 01:22:47 -04:00
Sasha Koshka	6fad52b335	Slider broadcasts slide event when manipulated with key presses	2024-05-17 01:09:59 -04:00
Sasha Koshka	8134069e1f	Add Value and SetValue to ScrollContainer	2024-05-17 01:08:39 -04:00
Sasha Koshka	dca1eaefb5	Add SunkenContainer	2024-05-13 19:48:29 -04:00
Sasha Koshka	87e81c00d3	Scrollbar and ScrollContainer use ScrollTo correctly	2024-05-13 19:45:18 -04:00
Sasha Koshka	224ca25000	NewHeading returns a Heading as expected	2024-05-07 20:21:45 -04:00
Sasha Koshka	f99f60d642	Button now removes its label if it is empty	2024-05-07 20:15:49 -04:00
Sasha Koshka	b4ab60df77	Reverse order of increment/decrement buttons in NumberInput	2024-05-07 20:15:27 -04:00
Sasha Koshka	a0fe7bc00f	Slider has an OnSlide method instead of OnValueChange	2024-05-07 18:24:44 -04:00
Sasha Koshka	1ff9982e01	Add NumberInput	2024-05-07 18:24:37 -04:00
Sasha Koshka	ca2f9654b3	Add OnEdit to TextInput	2024-05-07 18:24:25 -04:00
Sasha Koshka	4d790f7264	Add checkboxes	2024-05-07 13:45:06 -04:00
Sasha Koshka	49f010a8d6	Button.SetIcon now takes in theme.Icon	2024-05-06 23:23:59 -04:00
Sasha Koshka	39541e1b78	Upgrade Tomo version	2024-05-03 13:30:32 -04:00
Sasha Koshka	c8bcb9e428	Remove NewApplicationIcon constructor for Icon	2024-05-03 12:27:38 -04:00
Sasha Koshka	858129ec33	Upgrade Tomo version	2024-05-03 12:27:24 -04:00
Sasha Koshka	02551987a4	Add TextView, improved Scrollbar	2023-09-15 16:11:59 -04:00
Sasha Koshka	e45e391f6d	Added ScrollContainer	2023-09-15 01:47:58 -04:00
Sasha Koshka	71bc235c0e	Completed documentation for Scrollbar	2023-09-14 21:49:45 -04:00
Sasha Koshka	c9e556f47b	Scrollbars can be dragged	2023-09-14 21:40:06 -04:00
Sasha Koshka	15d7031e22	Scrollbar now displays scroll value	2023-09-14 21:04:59 -04:00
Sasha Koshka	134f8016c1	Progress on scrollbar	2023-09-14 20:34:56 -04:00
Sasha Koshka	2251d33ac7	Add documentation for Slider	2023-09-14 17:03:19 -04:00
Sasha Koshka	c210c07b74	WIP scrolling	2023-09-14 14:48:08 -04:00
Sasha Koshka	312ee6270c	Buttons can have icons (wip)	2023-09-07 18:13:10 -04:00
Sasha Koshka	59ca14cab6	Icon no longer panics on nil texture	2023-09-05 13:04:06 -04:00
Sasha Koshka	67a0e09101	bruhhhh	2023-09-04 02:56:23 -04:00
Sasha Koshka	9cba0151ce	Add godoc badge to readme	2023-09-04 02:49:24 -04:00
Sasha Koshka	d8d24632bb	Upgraded tomo version + added an Icon object	2023-09-04 02:32:04 -04:00
Sasha Koshka	05b6490095	Fixed vertical slider	2023-08-25 00:09:34 -04:00
Sasha Koshka	98bf754282	Upgraded tomo version	2023-08-24 16:54:28 -04:00
Sasha Koshka	8a7b2832df	Add grid layout	2023-08-20 17:41:14 -04:00
Sasha Koshka	84313885df	Made the Cut layout significantly more powerful	2023-08-14 00:24:28 -04:00
Sasha Koshka	3cf8df0cb2	I forgor the license	2023-08-13 21:56:16 -04:00