Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
d3a13c63
Commit
d3a13c63
authored
Mar 13, 2012
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: TimeLabel: use padding, not margin and spaces
parent
ea4e38b5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+8
-8
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
d3a13c63
...
...
@@ -585,7 +585,7 @@ TimeLabel::TimeLabel( intf_thread_t *_p_intf, TimeLabel::Display _displayType )
this
,
updateBuffering
(
float
)
);
CONNECT
(
bufTimer
,
timeout
(),
this
,
updateBuffering
()
);
this
->
setContentsMargins
(
4
,
0
,
4
,
0
);
setStyleSheet
(
"padding-left: 4px; padding-right: 4px;"
);
}
void
TimeLabel
::
setDisplayPosition
(
float
pos
,
int64_t
t
,
int
length
)
...
...
@@ -596,9 +596,9 @@ void TimeLabel::setDisplayPosition( float pos, int64_t t, int length )
if
(
pos
==
-
1.
f
)
{
if
(
displayType
==
TimeLabel
::
Both
)
setText
(
"
--:--/--:--
"
);
setText
(
"
--:--/--:--
"
);
else
setText
(
"
--:--
"
);
setText
(
"
--:--
"
);
return
;
}
...
...
@@ -610,17 +610,17 @@ void TimeLabel::setDisplayPosition( float pos, int64_t t, int length )
switch
(
displayType
)
{
case
TimeLabel
:
:
Elapsed
:
setText
(
QString
(
" "
)
+
QString
(
psz_time
)
+
QString
(
" "
)
);
setText
(
QString
(
psz_time
)
);
break
;
case
TimeLabel
:
:
Remaining
:
if
(
b_remainingTime
)
setText
(
QString
(
"
-"
)
+
QString
(
psz_time
)
+
QString
(
" "
)
);
setText
(
QString
(
"
-"
)
+
QString
(
psz_time
)
);
else
setText
(
QString
(
" "
)
+
QString
(
psz_length
)
+
QString
(
" "
)
);
setText
(
QString
(
psz_length
)
);
break
;
case
TimeLabel
:
:
Both
:
default:
QString
timestr
=
QString
(
"
%1%2/%3
"
)
QString
timestr
=
QString
(
"
%1%2/%3
"
)
.
arg
(
QString
(
(
b_remainingTime
&&
length
)
?
"-"
:
""
)
)
.
arg
(
QString
(
psz_time
)
)
.
arg
(
QString
(
(
!
length
&&
time
)
?
"--:--"
:
psz_length
)
);
...
...
@@ -643,7 +643,7 @@ void TimeLabel::setDisplayPosition( float pos )
secstotimestr
(
psz_time
,
(
b_remainingTime
&&
cachedLength
?
cachedLength
-
time
:
time
)
);
QString
timestr
=
QString
(
"
%1%2/%3
"
)
QString
timestr
=
QString
(
"
%1%2/%3
"
)
.
arg
(
QString
(
(
b_remainingTime
&&
cachedLength
)
?
"-"
:
""
)
)
.
arg
(
QString
(
psz_time
)
)
.
arg
(
QString
(
(
!
cachedLength
&&
time
)
?
"--:--"
:
psz_length
)
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment