- // actually in the current systems this should never be possible, but later reparenting
- // may become a reality
-
- if ( (ControlHandle) m_macControl == NULL )
- return ;
-
- if ( GetParent() == NULL )
- return ;
-
- WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
- if ( rootwindow == NULL )
- return ;
-
- int xborder, yborder;
- int minValWidth, maxValWidth, textwidth, textheight;
- int sliderBreadth;
-
- xborder = yborder = 0;
-
- if (GetWindowStyle() & wxSL_LABELS)
- {
- wxString text;
- int ht;
-
- // Get maximum text label width and height
- text.Printf("%d", m_rangeMin);
- GetTextExtent(text, &minValWidth, &textheight);
- text.Printf("%d", m_rangeMax);
- GetTextExtent(text, &maxValWidth, &ht);
- if(ht > textheight) {
- textheight = ht;
- }
- textwidth = (minValWidth > maxValWidth ? minValWidth : maxValWidth);
-
- xborder = textwidth + wxSLIDER_BORDERTEXT;
- yborder = textheight + wxSLIDER_BORDERTEXT;
-
- // Get slider breadth
- if(GetWindowStyle() & wxSL_AUTOTICKS) {
- sliderBreadth = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS;
- }
- else {
- sliderBreadth = wxSLIDER_DIMENSIONACROSS_ARROW;
- }
-
- if(GetWindowStyle() & wxSL_VERTICAL)
- {
- m_macMinimumStatic->Move(sliderBreadth + wxSLIDER_BORDERTEXT,
- m_height - yborder - textheight);
- m_macMaximumStatic->Move(sliderBreadth + wxSLIDER_BORDERTEXT, 0);
- m_macValueStatic->Move(0, m_height - textheight);
- }
- else
- {
- m_macMinimumStatic->Move(0, sliderBreadth + wxSLIDER_BORDERTEXT);
- m_macMaximumStatic->Move(m_width - xborder - maxValWidth / 2,
- sliderBreadth + wxSLIDER_BORDERTEXT);
- m_macValueStatic->Move(m_width - textwidth, 0);
- }
- }
-
- Rect oldBounds ;
- GetControlBounds( (ControlHandle) m_macControl , &oldBounds ) ;
-
- int new_x = m_x + MacGetLeftBorderSize() + m_macHorizontalBorder ;
- int new_y = m_y + MacGetTopBorderSize() + m_macVerticalBorder ;
- int new_width = m_width - MacGetLeftBorderSize() - MacGetRightBorderSize() - 2 * m_macHorizontalBorder - xborder ;
- int new_height = m_height - MacGetTopBorderSize() - MacGetBottomBorderSize() - 2 * m_macVerticalBorder - yborder ;
-
- GetParent()->MacWindowToRootWindow( & new_x , & new_y ) ;
- bool doMove = new_x != oldBounds.left || new_y != oldBounds.top ;
- bool doResize = ( oldBounds.right - oldBounds.left ) != new_width || (oldBounds.bottom - oldBounds.top ) != new_height ;
- if ( doMove || doResize )
- {
- InvalWindowRect( rootwindow, &oldBounds ) ;
- if ( doMove )
- {
- UMAMoveControl( (ControlHandle) m_macControl , new_x , new_y ) ;
- }
- if ( doResize )
- {
- UMASizeControl( (ControlHandle) m_macControl , new_width , new_height ) ;
- }
- }
+ int yborder = 0;
+ int minValWidth, maxValWidth, textheight;
+ int sliderBreadth;
+ int width = w;
+
+ if (GetWindowStyle() & wxSL_LABELS)
+ {
+ wxString text;
+ int ht, valValWidth;
+
+ // Get maximum text label width and height
+ text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
+ GetTextExtent(text, &minValWidth, &textheight);
+ text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
+ GetTextExtent(text, &maxValWidth, &ht);
+
+ if (ht > textheight)
+ textheight = ht;
+
+ if (GetWindowStyle() & wxSL_HORIZONTAL)
+ {
+ if ( m_macMinimumStatic )
+ {
+ w -= minValWidth / 2;
+ x += minValWidth / 2;
+ }
+
+ if ( m_macMaximumStatic )
+ w -= maxValWidth / 2;
+ }
+
+ // Labels have this control's parent as their parent
+ // so if this control is not at 0,0 relative to the parent
+ // the labels need to know the position of this control
+ // relative to its parent in order to size properly, so
+ // move the control first so we can use GetPosition()
+ wxControl::DoSetSize( x, y, w, h, sizeFlags );
+
+ if (GetWindowStyle() & wxSL_VERTICAL)
+ // If vertical, use current value
+ text.Printf(wxT("%d"), (int)m_peer->GetValue());
+ else
+ // Use max so that the current value doesn't drift as centering would need to change
+ text.Printf(wxT("%d"), m_rangeMax);
+
+ GetTextExtent(text, &valValWidth, &ht);
+
+ yborder = textheight + wxSLIDER_BORDERTEXT;
+
+ // Get slider breadth
+ if (GetWindowStyle() & wxSL_AUTOTICKS)
+ sliderBreadth = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS;
+ else
+ sliderBreadth = wxSLIDER_DIMENSIONACROSS_ARROW;
+
+ if (GetWindowStyle() & wxSL_VERTICAL)
+ {
+ h = h - yborder;
+
+ if ( m_macMinimumStatic )
+ m_macMinimumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + h - yborder);
+ if ( m_macMaximumStatic )
+ m_macMaximumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + 0);
+ if ( m_macValueStatic )
+ m_macValueStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + (h / 2) - (ht / 2));
+ }
+ else
+ {
+ if ( m_macMinimumStatic )
+ m_macMinimumStatic->Move(GetPosition().x, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
+ if ( m_macMaximumStatic )
+ m_macMaximumStatic->Move(GetPosition().x + w - maxValWidth, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
+ if ( m_macValueStatic )
+ m_macValueStatic->Move(GetPosition().x + (w / 2) - (valValWidth / 2), GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
+ }
+ }
+
+ // yet another hack since this is a composite control
+ // when wxSlider has it's size hardcoded, we're not allowed to
+ // change the size. But when the control has labels, we DO need
+ // to resize the internal Mac control to accommodate the text labels.
+ // We need to trick the wxWidgets resize mechanism so that we can
+ // resize the slider part of the control ONLY.
+
+ // TODO: Can all of this code go in the conditional wxSL_LABELS block?
+
+ int minWidth = m_minWidth;
+
+ if (GetWindowStyle() & wxSL_LABELS)
+ {
+ // make sure we don't allow the entire control to be resized accidently
+ if (width == GetSize().x)
+ m_minWidth = -1;
+ }
+
+ // If the control has labels, we still need to call this again because
+ // the labels alter the control's w and h values.
+ wxControl::DoSetSize( x, y, w, h, sizeFlags );
+
+ m_minWidth = minWidth;
projects / wxWidgets.git / blobdiff