Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
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
Alchemy Viewer
Alchemy Viewer
Commits
f6079c93
Commit
f6079c93
authored
15 years ago
by
Richard Linden
Browse files
Options
Downloads
Patches
Plain Diff
EXT-5515 - Allow resizing on left and lower left of nearby media popup
parent
effadd39
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llpanelnearbymedia.cpp
+22
-7
22 additions, 7 deletions
indra/newview/llpanelnearbymedia.cpp
indra/newview/llpanelnearbymedia.h
+5
-5
5 additions, 5 deletions
indra/newview/llpanelnearbymedia.h
with
27 additions
and
12 deletions
indra/newview/llpanelnearbymedia.cpp
+
22
−
7
View file @
f6079c93
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
#include
"llcheckboxctrl.h"
#include
"llcheckboxctrl.h"
#include
"llcombobox.h"
#include
"llcombobox.h"
#include
"llresizebar.h"
#include
"llresizebar.h"
#include
"llresizehandle.h"
#include
"llscrolllistctrl.h"
#include
"llscrolllistctrl.h"
#include
"llscrolllistitem.h"
#include
"llscrolllistitem.h"
#include
"llscrolllistcell.h"
#include
"llscrolllistcell.h"
...
@@ -116,6 +117,20 @@ BOOL LLPanelNearByMedia::postBuild()
...
@@ -116,6 +117,20 @@ BOOL LLPanelNearByMedia::postBuild()
p
.
resizing_view
=
this
;
p
.
resizing_view
=
this
;
addChild
(
LLUICtrlFactory
::
create
<
LLResizeBar
>
(
p
)
);
addChild
(
LLUICtrlFactory
::
create
<
LLResizeBar
>
(
p
)
);
p
.
rect
=
LLRect
(
0
,
getRect
().
getHeight
(),
RESIZE_BAR_THICKNESS
,
0
);
p
.
name
=
"resizebar_left"
;
p
.
min_size
=
getRect
().
getWidth
();
p
.
side
=
LLResizeBar
::
LEFT
;
addChild
(
LLUICtrlFactory
::
create
<
LLResizeBar
>
(
p
)
);
LLResizeHandle
::
Params
resize_handle_p
;
resize_handle_p
.
rect
=
LLRect
(
0
,
RESIZE_HANDLE_HEIGHT
,
RESIZE_HANDLE_WIDTH
,
0
);
resize_handle_p
.
mouse_opaque
(
false
);
resize_handle_p
.
min_width
(
getRect
().
getWidth
());
resize_handle_p
.
min_height
(
getRect
().
getHeight
());
resize_handle_p
.
corner
(
LLResizeHandle
::
LEFT_BOTTOM
);
addChild
(
LLUICtrlFactory
::
create
<
LLResizeHandle
>
(
resize_handle_p
));
mNearbyMediaPanel
=
getChild
<
LLUICtrl
>
(
"nearby_media_panel"
);
mNearbyMediaPanel
=
getChild
<
LLUICtrl
>
(
"nearby_media_panel"
);
mMediaList
=
getChild
<
LLScrollListCtrl
>
(
"media_list"
);
mMediaList
=
getChild
<
LLScrollListCtrl
>
(
"media_list"
);
mEnableAllCtrl
=
getChild
<
LLUICtrl
>
(
"all_nearby_media_enable_btn"
);
mEnableAllCtrl
=
getChild
<
LLUICtrl
>
(
"all_nearby_media_enable_btn"
);
...
@@ -148,8 +163,10 @@ BOOL LLPanelNearByMedia::postBuild()
...
@@ -148,8 +163,10 @@ BOOL LLPanelNearByMedia::postBuild()
updateColumns
();
updateColumns
();
LLView
*
minimized_controls
=
getChildView
(
"minimized_controls"
);
LLView
*
minimized_controls
=
getChildView
(
"minimized_controls"
);
mMoreHeight
=
getRect
().
getHeight
();
mMoreRect
=
getRect
();
mLessHeight
=
getRect
().
getHeight
()
-
minimized_controls
->
getRect
().
mBottom
;
mLessRect
=
getRect
();
mLessRect
.
mBottom
=
minimized_controls
->
getRect
().
mBottom
;
getChild
<
LLUICtrl
>
(
"more_less_btn"
)
->
setValue
(
false
);
getChild
<
LLUICtrl
>
(
"more_less_btn"
)
->
setValue
(
false
);
onMoreLess
();
onMoreLess
();
...
@@ -207,7 +224,7 @@ void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent)
...
@@ -207,7 +224,7 @@ void LLPanelNearByMedia::reshape(S32 width, S32 height, BOOL called_from_parent)
LLButton
*
more_less_btn
=
getChild
<
LLButton
>
(
"more_less_btn"
);
LLButton
*
more_less_btn
=
getChild
<
LLButton
>
(
"more_less_btn"
);
if
(
more_less_btn
->
getValue
().
asBoolean
())
if
(
more_less_btn
->
getValue
().
asBoolean
())
{
{
mMore
Heigh
t
=
getRect
()
.
getHeight
()
;
mMore
Rec
t
=
getRect
();
}
}
}
}
...
@@ -928,10 +945,8 @@ void LLPanelNearByMedia::onMoreLess()
...
@@ -928,10 +945,8 @@ void LLPanelNearByMedia::onMoreLess()
// enable resizing when expanded
// enable resizing when expanded
getChildView
(
"resizebar_bottom"
)
->
setEnabled
(
is_more
);
getChildView
(
"resizebar_bottom"
)
->
setEnabled
(
is_more
);
S32
new_height
=
is_more
?
mMoreHeight
:
mLessHeight
;
LLRect
new_rect
=
is_more
?
mMoreRect
:
mLessRect
;
new_rect
.
translate
(
getRect
().
mRight
-
new_rect
.
mRight
,
getRect
().
mTop
-
new_rect
.
mTop
);
LLRect
new_rect
=
getRect
();
new_rect
.
mBottom
=
new_rect
.
mTop
-
new_height
;
setShape
(
new_rect
);
setShape
(
new_rect
);
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llpanelnearbymedia.h
+
5
−
5
View file @
f6079c93
...
@@ -174,11 +174,11 @@ class LLPanelNearByMedia : public LLPanel
...
@@ -174,11 +174,11 @@ class LLPanelNearByMedia : public LLPanel
std
::
string
mParcelMediaName
;
std
::
string
mParcelMediaName
;
std
::
string
mParcelAudioName
;
std
::
string
mParcelAudioName
;
S32
mMore
Heigh
t
;
LLRect
mMore
Rec
t
;
S32
mLess
Heigh
t
;
LLRect
mLess
Rec
t
;
LLFrameTimer
mHoverTimer
;
LLFrameTimer
mHoverTimer
;
LLScrollListItem
*
mParcelMediaItem
;
LLScrollListItem
*
mParcelMediaItem
;
LLScrollListItem
*
mParcelAudioItem
;
LLScrollListItem
*
mParcelAudioItem
;
};
};
...
...
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