Commit Graph

161 Commits

Author SHA1 Message Date
Glenn Maynard f96c1296d1 simplify 2006-01-30 08:08:04 +00:00
Glenn Maynard cb0c7ce59d Set up tsDestination directly. It doesn't make sense for a
function named "UpdateEnabledDisabled" to do this, and we
don't need to delay it anymore as GetWidthXY says (that was
before we moved the text into a frame).
2006-01-30 08:06:31 +00:00
Glenn Maynard e89b93ba21 fix 0 tween length causing editor options menus to flicker
at y = 0 for one frame
2006-01-30 08:01:54 +00:00
Chris Danford 370d11ee19 theme -> localize 2006-01-29 22:17:54 +00:00
Chris Danford 7f821e8cfc CString -> RString 2006-01-22 01:00:06 +00:00
Glenn Maynard 235e9d622b use GetChoiceInRowWithFocus instead of m_iChoiceInRowWithFocus directly 2006-01-19 07:47:31 +00:00
Glenn Maynard 4e7e062d4e when LAYOUT_SHOW_ONE_IN_ROW, m_Underline will only have one entry anyway 2006-01-19 07:43:47 +00:00
Glenn Maynard 91a52982e4 simplify 2006-01-19 07:32:42 +00:00
Glenn Maynard b52e776f36 remove def param; use m_Def 2006-01-19 03:43:29 +00:00
Glenn Maynard 55958c952d err 2006-01-19 03:21:57 +00:00
Chris Danford 4b5d9a981e tab cleanup 2006-01-19 03:02:48 +00:00
Glenn Maynard 544733b287 don't have to import both players at once, so AfterImportOptions takes pn 2006-01-19 01:52:18 +00:00
Glenn Maynard 7e005dfbb9 simplify 2006-01-19 01:27:02 +00:00
Glenn Maynard e87e8d77e4 update m_textTitle when choices change, eg. on load and reload--don't need to do it on import 2006-01-19 01:25:09 +00:00
Glenn Maynard 8da0e94aa2 UpdateText is used when the focus changes, so call it from
SetChoiceInRowWithFocus.
2006-01-19 01:23:14 +00:00
Glenn Maynard 10106ba600 remove redundant SetChoiceInRowWithFocus call 2006-01-19 01:17:07 +00:00
Glenn Maynard 054cfa98d8 use pn 2006-01-19 01:15:12 +00:00
Glenn Maynard 41f8a34c9f fewer code paths to set m_iChoiceInRowWithFocus 2006-01-19 01:14:59 +00:00
Glenn Maynard 8bcf6e8b12 fewer code paths to set m_iChoiceInRowWithFocus 2006-01-19 01:14:31 +00:00
Glenn Maynard 74bf033fe7 comment 2006-01-19 01:11:23 +00:00
Glenn Maynard b158147319 pull pn loop out of UpdateText 2006-01-19 01:01:13 +00:00
Glenn Maynard 24cd1d3242 pull pn loop out of UpdateText 2006-01-19 01:00:13 +00:00
Glenn Maynard 0b1ca16baf underline position depends on the focus (in LAYOUT_SHOW_ONE_IN_ROW), so set it after ResetFocusFromSelection 2006-01-19 00:33:48 +00:00
Glenn Maynard f3c94e55c6 cleanup 2006-01-19 00:31:05 +00:00
Glenn Maynard 49b5375af8 Split out ResetFocusFromSelection.
Don't reset m_iChoiceInRowWithFocus in ResetFocusFromSelection
for SELECT_MULTIPLE or SELECT_NONE.  That's done by ChoicesChanged.
2006-01-19 00:29:22 +00:00
Glenn Maynard b669b72702 reset m_iChoiceInRowWithFocus in ChoicesChanged 2006-01-19 00:24:51 +00:00
Glenn Maynard c780377085 fix iSelection 2006-01-18 23:41:24 +00:00
Glenn Maynard 17202a5284 simplify: no need to special case Exit 2006-01-18 04:59:00 +00:00
Glenn Maynard aab0edf1c2 merge dupe code 2006-01-18 04:56:39 +00:00
Glenn Maynard 74e36431b4 move Load functions together 2006-01-18 04:32:40 +00:00
Glenn Maynard 7537e3fd65 use AfterImportOptions 2006-01-18 04:29:25 +00:00
Glenn Maynard 7b4c4643da update underlines in AfterImportOptions 2006-01-18 04:25:52 +00:00
Glenn Maynard 6e7af389e8 nudge more
we assume we have at least one option in SELECT_ONE and tend
to crash if we don't; assert it
2006-01-18 04:19:40 +00:00
Glenn Maynard 40eacaa61d After Reload, don't keep the old focus around; our items
have changed and there's not necessarily any corrolation
between the old and the new.  Connecting those is up to
export/import.  (nudging Reload together with LoadNormal
and AfterImportOptions, the logic duplication is confusing)
2006-01-18 04:12:59 +00:00
Glenn Maynard 71cb277d84 InitText automatically 2006-01-18 04:10:31 +00:00
Glenn Maynard 48aa85bfdb nudge towards LoadNormal 2006-01-18 04:07:35 +00:00
Glenn Maynard e8c5ac24a2 Fix up Reload: re-add NextRow, do re-import (or the
m_iChoiceInRowWithFocus code is meaningless)
2006-01-18 04:00:58 +00:00
Glenn Maynard a3dc5596de OptionRow::Reload doesn't take an OptionRowDefinition.
Implement Reload() explicitly, so we can clearly short-
circuit for static rows.

Fix up ScreenOptionsEditCourseEntry (broken during the
course of things).
2006-01-18 01:34:45 +00:00
Glenn Maynard 7a3282ea9a unused 2006-01-17 23:57:19 +00:00
Glenn Maynard b60126a261 remove redundant m_RowDef 2006-01-17 22:16:58 +00:00
Glenn Maynard a7fc41580d partial revert: m_pHand may be NULL before loaded 2006-01-17 22:15:53 +00:00
Glenn Maynard fd54367ea7 all option rows have handlers 2006-01-17 22:06:00 +00:00
Glenn Maynard b6a49fab47 use a handler for LoadExit, too
now all option rows have handlers
2006-01-17 22:03:56 +00:00
Glenn Maynard a42ba8e13f simplify 2006-01-17 21:40:39 +00:00
Glenn Maynard ce43aab773 simplify Reload 2006-01-17 21:36:44 +00:00
Glenn Maynard 45d3dff2d6 partial fix for re-using SPO 2006-01-17 05:41:17 +00:00
Glenn Maynard 473a985512 const 2006-01-17 05:24:42 +00:00
Glenn Maynard 3c63e09ca3 Previously, OptionRowHandler was owned and freed by
ScreenOptionsMaster (and ScreenOptionsManageProfiles).
Make it owned by OptionRow; the only pointer to them
is where they're stored in the OptionRow.  This
eliminates the remaining association between m_OptionRowHandlers
and m_pRows; that was confusing, because they're in
different places, and aren't always the same size.  It
also simplifies using OptionRowHandlers.
2006-01-16 22:55:57 +00:00
Glenn Maynard dddf6f48bb cleanup 2006-01-16 19:50:56 +00:00
Glenn Maynard 080d0d5042 cleanup 2006-01-16 19:37:23 +00:00