f00e70e5d4
Collateral fix: SetBaseAlpha is propagated by ActorFrame.
2006-02-27 03:09:00 +00:00
c2243b0b0e
ScreenOptions fading is a headache. We move rows up and down, and
...
fade them in and out at the same time; we do this by tweening the whole
row up and down, and fading each part of the row. This is a big pain,
because we're also tweening each part for other reasons, and these
tweens tend to collide. The whole thing is brittle and complicated,
and it's making fixing other problems a pain.
Try it a little differently: to fade the whole row, tween the alpha
along with the position of the whole row. Then, manually propagate
the changing alpha value to each part, using BaseAlpha, so it doesn't
affect other tweens.
This also helps segregate the fading: with the exception of the actual
propagation, OptionRow doesn't have to know anything about it. Before,
it had to constantly be careful that any tweening operations didn't
collide with the alpha tweening; often, one or the other would be cancelled,
resulting in either the change not happening at all, or snapping instead
of fading.
(This is still a hack, but it's more manageable; it puts control of high-level
tweening entirely in SOptionsMenu's control, instead of half in OptionRow.)
2006-02-27 03:04:56 +00:00
d5f650dce5
fix hidden underlines for disabled players (missed commit)
2006-02-26 21:38:44 +00:00
b73b9e66f0
cleanup
2006-02-26 21:35:18 +00:00
06b19345a9
fix NextRow markers accumulate when a row is reloaded
2006-02-22 18:12:45 +00:00
95c88765a0
fix options rows tween from top of screen instead of initially being in the row's position
2006-02-10 04:33:54 +00:00
2e95edf9da
PositionIcons(pn)
2006-02-03 09:31:51 +00:00
f96c1296d1
simplify
2006-01-30 08:08:04 +00:00
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
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
370d11ee19
theme -> localize
2006-01-29 22:17:54 +00:00
7f821e8cfc
CString -> RString
2006-01-22 01:00:06 +00:00
235e9d622b
use GetChoiceInRowWithFocus instead of m_iChoiceInRowWithFocus directly
2006-01-19 07:47:31 +00:00
4e7e062d4e
when LAYOUT_SHOW_ONE_IN_ROW, m_Underline will only have one entry anyway
2006-01-19 07:43:47 +00:00
91a52982e4
simplify
2006-01-19 07:32:42 +00:00
b52e776f36
remove def param; use m_Def
2006-01-19 03:43:29 +00:00
55958c952d
err
2006-01-19 03:21:57 +00:00
4b5d9a981e
tab cleanup
2006-01-19 03:02:48 +00:00
544733b287
don't have to import both players at once, so AfterImportOptions takes pn
2006-01-19 01:52:18 +00:00
7e005dfbb9
simplify
2006-01-19 01:27:02 +00:00
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
8da0e94aa2
UpdateText is used when the focus changes, so call it from
...
SetChoiceInRowWithFocus.
2006-01-19 01:23:14 +00:00
10106ba600
remove redundant SetChoiceInRowWithFocus call
2006-01-19 01:17:07 +00:00
054cfa98d8
use pn
2006-01-19 01:15:12 +00:00
41f8a34c9f
fewer code paths to set m_iChoiceInRowWithFocus
2006-01-19 01:14:59 +00:00
8bcf6e8b12
fewer code paths to set m_iChoiceInRowWithFocus
2006-01-19 01:14:31 +00:00
74bf033fe7
comment
2006-01-19 01:11:23 +00:00
b158147319
pull pn loop out of UpdateText
2006-01-19 01:01:13 +00:00
24cd1d3242
pull pn loop out of UpdateText
2006-01-19 01:00:13 +00:00
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
f3c94e55c6
cleanup
2006-01-19 00:31:05 +00:00
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
b669b72702
reset m_iChoiceInRowWithFocus in ChoicesChanged
2006-01-19 00:24:51 +00:00
c780377085
fix iSelection
2006-01-18 23:41:24 +00:00
17202a5284
simplify: no need to special case Exit
2006-01-18 04:59:00 +00:00
aab0edf1c2
merge dupe code
2006-01-18 04:56:39 +00:00
74e36431b4
move Load functions together
2006-01-18 04:32:40 +00:00
7537e3fd65
use AfterImportOptions
2006-01-18 04:29:25 +00:00
7b4c4643da
update underlines in AfterImportOptions
2006-01-18 04:25:52 +00:00
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
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
71cb277d84
InitText automatically
2006-01-18 04:10:31 +00:00
48aa85bfdb
nudge towards LoadNormal
2006-01-18 04:07:35 +00:00
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
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
7a3282ea9a
unused
2006-01-17 23:57:19 +00:00
b60126a261
remove redundant m_RowDef
2006-01-17 22:16:58 +00:00
a7fc41580d
partial revert: m_pHand may be NULL before loaded
2006-01-17 22:15:53 +00:00
fd54367ea7
all option rows have handlers
2006-01-17 22:06:00 +00:00
b6a49fab47
use a handler for LoadExit, too
...
now all option rows have handlers
2006-01-17 22:03:56 +00:00
Glenn Maynard