Changeset dc5c303 in mainline for uspace/app/taskbar/clock.c


Ignore:
Timestamp:
2023-12-28T13:59:23Z (2 years ago)
Author:
GitHub <noreply@…>
Children:
6b66de6b
Parents:
42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)
git-committer:
GitHub <noreply@…> (2023-12-28 13:59:23)
Message:

Merge branch 'master' into topic/packet-capture

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/taskbar/clock.c

    r42c2e65 rdc5c303  
    3030 * @{
    3131 */
    32 /** @file Task bar clock.
     32/** @file Taskbar clock.
    3333 *
    3434 * Displays the current time in an inset frame.
    … …  
    5353static void taskbar_clock_timer(void *);
    5454
    55 /** Task bar clock control ops */
     55/** Taskbar clock control ops */
    5656static ui_control_ops_t taskbar_clock_ctl_ops = {
    5757        .destroy = taskbar_clock_ctl_destroy,
    … …  
    6161};
    6262
    63 /** Create task bar clock.
     63/** Create taskbar clock.
    6464 *
    6565 * @param window Containing window
    … …  
    102102}
    103103
    104 /** Destroy task bar clock.
    105  *
    106  * @param clock Task bar clock
     104/** Destroy taskbar clock.
     105 *
     106 * @param clock Taskbar clock
    107107 */
    108108void taskbar_clock_destroy(taskbar_clock_t *clock)
    … …  
    149149}
    150150
    151 /** Paint task bar clock.
    152  *
    153  * @param clock Task bar clock
     151/** Paint taskbar clock.
     152 *
     153 * @param clock Taskbar clock
    154154 */
    155155errno_t taskbar_clock_paint(taskbar_clock_t *clock)
    … …  
    208208}
    209209
    210 /** Handle task bar clock keyboard event.
    211  *
    212  * @param clock Task bar clock
     210/** Handle taskbar clock keyboard event.
     211 *
     212 * @param clock Taskbar clock
    213213 * @param event Keyboard event
    214214 * @return ui_claimed iff event was claimed
    … …  
    219219}
    220220
    221 /** Handle task bar clock position event.
    222  *
    223  * @param clock Task bar clock
     221/** Handle taskbar clock position event.
     222 *
     223 * @param clock Taskbar clock
    224224 * @param event Position event
    225225 * @return ui_claimed iff event was claimed
    … …  
    237237}
    238238
    239 /** Get base control for task bar clock.
    240  *
    241  * @param clock Task bar clock
     239/** Get base control for taskbar clock.
     240 *
     241 * @param clock Taskbar clock
    242242 * @return Base UI control
    243243 */
    … …  
    247247}
    248248
    249 /** Set task bar clock rectangle.
    250  *
    251  * @param clock Task bar clock
     249/** Set taskbar clock rectangle.
     250 *
     251 * @param clock Taskbar clock
    252252 * @param rect Rectangle
    253253 */
    … …  
    277277}
    278278
    279 /** Paint task bar clock control.
     279/** Paint taskbar clock control.
    280280 *
    281281 * @param arg Argument (taskbar_clock_t *)
    … …  
    289289}
    290290
    291 /** Handle task bar clock control keyboard event.
     291/** Handle taskbar clock control keyboard event.
    292292 *
    293293 * @param arg Argument (taskbar_clock_t *)
    … …  
    302302}
    303303
    304 /** Handle task bar clock control position event.
     304/** Handle taskbar clock control position event.
    305305 *
    306306 * @param arg Argument (taskbar_clock_t *)
    … …  
    322322{
    323323        taskbar_clock_t *clock = (taskbar_clock_t *) arg;
     324        ui_t *ui;
     325
     326        ui = ui_window_get_ui(clock->window);
     327        ui_lock(ui);
    324328
    325329        fibril_mutex_lock(&clock->lock);
    326         (void) taskbar_clock_paint(clock);
     330        if (!ui_is_suspended(ui_window_get_ui(clock->window)))
     331                (void) taskbar_clock_paint(clock);
    327332
    328333        if (!clock->timer_cleanup) {
    … …  
    336341
    337342        fibril_mutex_unlock(&clock->lock);
     343        ui_unlock(ui);
    338344}
    339345
Note: See TracChangeset for help on using the changeset viewer.