Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
JennaHuntsman
XDG Integration
Commits
f9cf5974
Commit
f9cf5974
authored
1 year ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix chat alert color editor
parent
25ba07af
No related branches found
Branches containing commit
No related tags found
2 merge requests
!3
Update to main branch
,
!2
Rebase onto current main branch
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llcolorswatch.cpp
+18
-0
18 additions, 0 deletions
indra/newview/llcolorswatch.cpp
indra/newview/llcolorswatch.h
+7
-0
7 additions, 0 deletions
indra/newview/llcolorswatch.h
with
25 additions
and
0 deletions
indra/newview/llcolorswatch.cpp
+
18
−
0
View file @
f9cf5974
...
...
@@ -128,10 +128,25 @@ BOOL LLColorSwatchCtrl::handleUnicodeCharHere(llwchar uni_char)
return
LLUICtrl
::
handleUnicodeCharHere
(
uni_char
);
}
// [SL:KB] - Patch: Control-ColorSwatchCtrl | Checked: 2012-08-28 (Catznip-3.3)
BOOL
LLColorSwatchCtrl
::
isDirty
()
const
{
return
(
mColor
!=
mPrevColor
);
}
void
LLColorSwatchCtrl
::
resetDirty
()
{
mPrevColor
=
mColor
;
}
// [/SL:KB]
// forces color of this swatch and any associated floater to the input value, if currently invalid
void
LLColorSwatchCtrl
::
setOriginal
(
const
LLColor4
&
color
)
{
mColor
=
color
;
// [SL:KB] - Patch: Control-ColorSwatchCtrl | Checked: 2012-08-28 (Catznip-3.3)
mPrevColor
=
mColor
;
// [/SL:KB]
LLFloaterColorPicker
*
pickerp
=
(
LLFloaterColorPicker
*
)
mPickerHandle
.
get
();
if
(
pickerp
)
{
...
...
@@ -142,6 +157,9 @@ void LLColorSwatchCtrl::setOriginal(const LLColor4& color)
void
LLColorSwatchCtrl
::
set
(
const
LLColor4
&
color
,
BOOL
update_picker
,
BOOL
from_event
)
{
mColor
=
color
;
// [SL:KB] - Patch: Control-ColorSwatchCtrl | Checked: 2012-08-28 (Catznip-3.3)
mPrevColor
=
mColor
;
// [/SL:KB]
LLFloaterColorPicker
*
pickerp
=
(
LLFloaterColorPicker
*
)
mPickerHandle
.
get
();
if
(
pickerp
&&
update_picker
)
{
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llcolorswatch.h
+
7
−
0
View file @
f9cf5974
...
...
@@ -75,6 +75,10 @@ class LLColorSwatchCtrl final
/*virtual*/
LLSD
getValue
()
const
{
return
mColor
.
getValue
();
}
const
LLColor4
&
get
()
{
return
mColor
;
}
// [SL:KB] - Patch: Control-ColorSwatchCtrl | Checked: 2012-08-28 (Catznip-3.3)
/*virtual*/
BOOL
isDirty
()
const
;
// Returns TRUE if user changed value at all
/*virtual*/
void
resetDirty
();
// Clear dirty state
// [/SL:KB]
void
set
(
const
LLColor4
&
color
,
BOOL
update_picker
=
FALSE
,
BOOL
from_event
=
FALSE
);
void
setOriginal
(
const
LLColor4
&
color
);
...
...
@@ -103,6 +107,9 @@ class LLColorSwatchCtrl final
protected
:
bool
mValid
;
LLColor4
mColor
;
// [SL:KB] - Patch: Control-ColorSwatchCtrl | Checked: 2012-08-28 (Catznip-3.3)
LLColor4
mPrevColor
;
// [/SL:KB]
LLUIColor
mBorderColor
;
LLTextBox
*
mCaption
;
LLHandle
<
LLFloater
>
mPickerHandle
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment